diff --git a/rowers/tasks.py b/rowers/tasks.py
index d9ca397a..fcd7bc62 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -381,8 +381,9 @@ def handle_check_race_course(self,
             except IOError:
                 return 0
 
-
+    row.calc_dist_from_gps()
     rowdata = row.df
+    rowdata['cum_dist'] = rowdata['gps_dist_calculated']
 
     try:
         s = rowdata[' latitude']
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 955e6abe..a407d0e2 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -5913,13 +5913,34 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 
     # we are saving the results obtained from the split by power/pace interpreter
     elif request.method == 'POST' and "savepowerpaceform" in request.POST:
-        powerorpace = request.POST['powerorpace']
-        value_pace = request.POST['value_pace']
-        value_power = request.POST['value_power']
-        value_work = request.POST['value_work']
-        value_spm = request.POST['value_spm']
-        activeminutesmin = request.POST['activeminutesmin']
-        activeminutesmax = request.POST['activeminutesmax']
+        try:
+            powerorpace = request.POST['powerorpace']
+        except:
+            powerorpace = 'pace'
+        try:
+            value_pace = request.POST['value_pace']
+        except:
+            value_pace = avpace
+        try:
+            value_power = request.POST['value_power']
+        except:
+            value_power = int(normp)
+        try:
+            value_work = request.POST['value_work']
+        except:
+            value_work = int(normw)
+        try:
+            value_spm = request.POST['value_spm']
+        except:
+            value_spm = int(normspm)
+        try:
+            activeminutesmin = request.POST['activeminutesmin']
+        except:
+            activeminutesmin = 0
+        try:
+            activeminutesmax = request.POST['activeminutesmax']
+        except:
+            pass
         try:
             activesecondsmin = 60.*float(activeminutesmin)
             activesecondsmax = 60.*float(activeminutesmax)