diff --git a/Tests/read_eddy.f b/Tests/read_eddy.f
index 0aa2ff8c38e0710391fe31c32007118d83e86d6a..10c7ce1e9e9541aaa8ea9f5623df4a98217635cb 100644
--- a/Tests/read_eddy.f
+++ b/Tests/read_eddy.f
@@ -12,7 +12,7 @@ contains
     use contour_531, only: null_polyline
     use derived_types, only: eddy
     use gpc_f, only: shpobj2pol, polygon
-    use nr_util, only: pi
+    use nr_util, only: pi, deg_to_rad
     use shapelib, only: shpfileobject, shpobject, dbfreadattribute, &
          shpdestroyobject
     use shapelib_03, only: shp_read_object_03
@@ -40,8 +40,6 @@ contains
     ! We need this intermediary variable because the kind of the
     ! argument to dbfreadattribute cannot be the default kind
 
-    real, parameter:: deg_to_rad = pi / 180.
-
     !---------------------------------------------------------------------
 
     call dbfreadattribute(hshp_extremum, ishape, ifield = 0, attr = attr)
diff --git a/get_snapshot.f b/get_snapshot.f
index 9cc074ee585263bda55e3e846d57662c0d99c163..366ec9d1c5078dd2e8f4bf13fd2e7cd60a4d5bbd 100644
--- a/get_snapshot.f
+++ b/get_snapshot.f
@@ -109,6 +109,7 @@ contains
                   [nlon, nlat])
              ! (min should have no effect except because of roundup error)
              
+             ! Define nearby_extr:
              selection = abs(pack(s%extr_map(llc(1):urc(1), llc(2):urc(2)), &
                   s%extr_map(llc(1):urc(1), llc(2):urc(2)) > 0 &
                   .and. s%extr_map(llc(1):urc(1), llc(2):urc(2)) /= i))
@@ -116,6 +117,7 @@ contains
              allocate(nearby_extr(2, n_select))
              forall (l = 1:n_select) &
                   nearby_extr(:, l) = s%list_vis(selection(l))%coord_extr
+
              call set_max_speed(s%list_vis(i), s%ind_extr(:, i) - llc + 1, &
                   nearby_extr, ssh(llc(1):urc(1), llc(2):urc(2)), &
                   u(llc(1):urc(1), llc(2):urc(2)), &