diff --git a/rowers/integrations/nk.py b/rowers/integrations/nk.py
index b8c31e36..ea1488cf 100644
--- a/rowers/integrations/nk.py
+++ b/rowers/integrations/nk.py
@@ -59,6 +59,14 @@ class NKIntegration(SyncIntegration):
     def get_workouts(self, *args, **kwargs) -> int:
         before = kwargs.get('before',0)
         after = kwargs.get('after',0)
+
+        if not before:  # pragma: no cover
+            before = arrow.now()+timedelta(days=1)
+            before = str(int(before.timestamp())*1000)
+        if not after:  # pragma: no cover
+            after = arrow.now()-timedelta(days=7)
+            after = str(int(after.timestamp())*1000)
+        
         try:
             _ = self.open()
         except NoTokenError:  # pragma: no cover
@@ -71,25 +79,29 @@ class NKIntegration(SyncIntegration):
             nkid = workout['id']
             if workout['new'] == 'NEW':
                 dologging('nklog.log','Queueing {id}'.format(id=nkid))
-                self.get_workout(nkid)
+                self.get_workout(nkid, before=before, after=after)
 
         return 1
 
 
     def get_workout(self, id, *args, **kwargs) -> int:
-        startdate = kwargs.get('startdate','')
-        enddate = kwargs.get('enddate','')
         _ = self.open()
         r = self.rower
 
-        before = 0
-        after = 0
-        if startdate:  # pragma: no cover
-            startdate = arrow.get(startdate)
-            after = str(int(startdate.timestamp())*1000)
-        if enddate:  # pragma: no cover
-            enddate = arrow.get(enddate)
-            before = str(int(enddate.timestamp())*1000)
+        before = kwargs.get('before',0)
+        after = kwargs.get('after',0)
+        if not before:
+            startdate = kwargs.get('startdate','')
+            enddate = kwargs.get('enddate','')
+
+            before = 0
+            after = 0
+            if startdate:  # pragma: no cover
+                startdate = arrow.get(startdate)
+                after = str(int(startdate.timestamp())*1000)
+            if enddate:  # pragma: no cover
+                enddate = arrow.get(enddate)
+                before = str(int(enddate.timestamp())*1000)
 
         jsondata = self.get_workout_list_json(before=before, after=after)
 
diff --git a/rowers/integrations/polar.py b/rowers/integrations/polar.py
index 0adac679..9bc40472 100644
--- a/rowers/integrations/polar.py
+++ b/rowers/integrations/polar.py
@@ -253,8 +253,12 @@ class PolarIntegration(SyncIntegration):
 
         return 1
 
-    def register_user(self, token):
-        _ = self.open()
+    def register_user(self, token, *args, **kwargs):
+        try:
+            _ = self.open()
+        except NoTokenError:
+            pass
+
 
         authorizationstring = 'Bearer {token}'.format(token=token)
         headers = {
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 6ae55be8..2efd361f 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index c9405151..ffdffea9 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -44,6 +44,9 @@ ALLOWED_HOSTS = CFG['allowed_hosts']
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
+# data max upload fields
+DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000
+
 # Application definition
 
 INSTALLED_APPS = [