diff --git a/Emitron/Emitron/Guardpost/Guardpost.swift b/Emitron/Emitron/Guardpost/Guardpost.swift
index 81e40f51..890c6133 100644
--- a/Emitron/Emitron/Guardpost/Guardpost.swift
+++ b/Emitron/Emitron/Guardpost/Guardpost.swift
@@ -113,9 +113,7 @@ public extension Guardpost {
 
       // This will prevent sharing cookies with Safari, which means no auto-login
       // However, it also means that you can actually log out, which is good, I guess.
-      #if (!DEBUG)
       authSession.prefersEphemeralWebBrowserSession = true
-      #endif
 
       authSession.start()
     }
diff --git a/Emitron/Emitron/Models/DataCache.swift b/Emitron/Emitron/Models/DataCache.swift
index 541265a2..4fd28651 100644
--- a/Emitron/Emitron/Models/DataCache.swift
+++ b/Emitron/Emitron/Models/DataCache.swift
@@ -71,8 +71,7 @@ extension DataCache {
     cacheUpdate.progressions.forEach { progressions[$0.contentID] = $0 }
     cacheUpdate.groups.forEach { groupIndexedGroups[$0.id] = $0 }
 
-    // swiftlint:disable generic_type_name
-    func mergeWithCacheUpdate<contentID: Emitron.contentID>(
+    func mergeWithCacheUpdate<contentID: Emitron.contentID>( // swiftlint:disable:this generic_type_name
       _ dictionary: inout [Int: [contentID]],
       _ getContentID: (DataCacheUpdate) -> [contentID]
     ) {
diff --git a/Emitron/Emitron/Persistence/EmitronDatabase.swift b/Emitron/Emitron/Persistence/EmitronDatabase.swift
index a444cd8a..6cee961d 100644
--- a/Emitron/Emitron/Persistence/EmitronDatabase.swift
+++ b/Emitron/Emitron/Persistence/EmitronDatabase.swift
@@ -29,6 +29,7 @@
 
 import GRDB
 
+// We use `t` as a variable name rather a lot
 // swiftlint:disable identifier_name
 
 /// A type responsible for initialising the application's database
@@ -170,3 +171,6 @@ enum EmitronDatabase {
     return migrator
   }
 }
+
+// Stop swiftlint complaining
+// swiftlint:enable identifier_name