diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py
index bc728813..dec62b76 100644
--- a/rowers/integrations/intervals.py
+++ b/rowers/integrations/intervals.py
@@ -344,6 +344,8 @@ class IntervalsIntegration(SyncIntegration):
         for w in ws:
             try:
                 w.name = data['name']
+                if length(w.name) >= 350:
+                    w.name = w.name[:350]
             except KeyError:
                 pass
             try:
@@ -370,7 +372,7 @@ class IntervalsIntegration(SyncIntegration):
                     w.is_commute = False
             except KeyError:
                 w.is_commute = False
-            
+
             w.save()
 
             try:
diff --git a/rowers/models.py b/rowers/models.py
index 24a5f5be..b66e4e08 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3775,7 +3775,7 @@ class Workout(models.Model):
     team = models.ManyToManyField(Team, blank=True)
     plannedsession = models.ForeignKey(PlannedSession, blank=True, null=True,
                                        verbose_name='Session', on_delete=models.SET_NULL)
-    name = models.CharField(max_length=150, blank=True, null=True)
+    name = models.CharField(max_length=350, blank=True, null=True)
     date = models.DateField(blank=True, null=True)
     workouttype = models.CharField(choices=workouttypes, max_length=50,
                                    verbose_name='Exercise/Boat Class')
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 5a3b8623..bd322c03 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 520449c3..bf4aefac 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -101,6 +101,11 @@ AUTHENTICATION_BACKENDS = (
 
 CSRF_TRUSTED_ORIGINS = ['https://rowsandall.com', 'https://www.rowsandall.com', 'http://localhost', 'https://dunav.ngrok.io']
 
+CSRF_COOKIE_SAMESITE = 'None'
+CSRF_COOKIE_SECURE = True
+SESSION_COOKIE_SAMESITE = 'None'
+SESSION_COOKIE_SECURE = True
+
 MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.middleware.common.BrokenLinkEmailsMiddleware',