diff --git a/rowers/models.py b/rowers/models.py
index df06502a..016db05e 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -108,7 +108,7 @@ class TemplateListField(models.TextField):
     def get_db_prep_value(self, value, connection, prepared=False):
         if not value: return
         assert(isinstance(value, list) or isinstance(value, tuple))
-        return self.token.join([unicode(s) for s in value])
+        return self.token.join([str(s) for s in value])
 
     def value_to_string(self, obj):
         value = self._get_val_from_obj(obj)
@@ -151,7 +151,7 @@ class PowerZonesField(models.TextField):
     def get_db_prep_value(self, value, connection, prepared=False):
         if not value: return
         assert(isinstance(value, list) or isinstance(value, tuple))
-        return self.token.join([unicode(s) for s in value])
+        return self.token.join([str(s) for s in value])
 
     def value_to_string(self, obj):
         value = self._get_val_from_obj(obj)
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index d82b57de..0570901a 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 4a36f355..93f4edb8 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -444,14 +444,23 @@ rq_registrylow = StartedJobRegistry(queuelow.name,connection=redis_connection)
 
 from rq.job import Job
 
-from rest_framework_swagger.views import get_swagger_view
+try:
+    from rest_framework_swagger.views import get_swagger_view
+except ImportError:
+    pass
+
 from rest_framework.renderers import JSONRenderer
 from rest_framework.parsers import JSONParser
 from rest_framework.response import Response
 from rowers.serializers import RowerSerializer,WorkoutSerializer
-from rest_framework import status,permissions,generics
+try:
+    from rest_framework import status,permissions,generics
+except ImportError:
+    pass
+
 from rest_framework.decorators import api_view, renderer_classes
 
+
 from rowers.permissions import IsOwnerOrNot
 
 import rowers.plots as plots
@@ -472,7 +481,10 @@ from rowers.interactiveplots import *
 from rowers.celery import result as celery_result
 
 # Define the API documentation
-schema_view = get_swagger_view(title='Rowsandall API')
+try:
+    schema_view = get_swagger_view(title='Rowsandall API')
+except NameError:
+    pass
 
 def remove_asynctask(request,id):
     try:
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 6f6dadef..9e4656ca 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -59,7 +59,7 @@ INSTALLED_APPS = [
     'django_mailbox',
     'rest_framework',
     'datetimewidget',
-    'rest_framework_swagger',
+#    'rest_framework_swagger',
     'oauth2_provider',
     'corsheaders',
     'analytical',