diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index efb5862e..77eb7a12 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -61,7 +61,7 @@ def usermessages(rower):
     try:
         msgs = UserMessage.objects.filter(receiver=rower, isread=False)
         return msgs.count()
-    except UserMessage.DoesNotExist:
+    except (UserMessage.DoesNotExist, ValueError):
         pass
 
     return 0
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index a64038ca..0e0d46bf 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py
index 4e30399b..cc07d85b 100644
--- a/rowers/views/importviews.py
+++ b/rowers/views/importviews.py
@@ -6,7 +6,7 @@ from rowsandall_app.settings import (
 from rowers.views.statements import *
 from rowers.plannedsessions import get_dates_timeperiod
 from rowers.tasks import fetch_strava_workout
-
+from rowers.utils import NoTokenError
 
 import rowers.integrations.strava as strava
 from rowers.integrations import importsources
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index bf878249..a1e4d704 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1764,7 +1764,7 @@ def virtualevent_compare_view(request, id=0):
     xparam = 'time'
     yparam = 'pace'
 
-    if request.method == 'GET':
+    if request.method in ('GET','HEAD'):
         if race.sessionmode == 'distance':
             xparam = 'cumdist'