diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c76a161b0c..2cef0ff948 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -156,7 +156,7 @@ jobs:
           [ -z "$(git diff --name-only '*.js' '*.ts' '*.svelte' '*.json' '*.yaml' | cat)" ]
           echo '================================================================'
       - name: Formatting...
-        run: node common/scripts/install-run-rush.js fast-format --branch ${{ github.base_ref }}
+        run: node common/scripts/install-run-rush.js fast-format --branch ${{ github.base_ref || 'develop' }}
       - name: Check files formatting
         run: |
           echo '================================================================'
diff --git a/server/account/src/collections/postgres.ts b/server/account/src/collections/postgres.ts
index 21877db60f..e2522e0b5d 100644
--- a/server/account/src/collections/postgres.ts
+++ b/server/account/src/collections/postgres.ts
@@ -560,7 +560,7 @@ export class PostgresAccountDB implements AccountDB {
         operationSql = `(${pendingCreationSql} OR ${pendingUpgradeSql})`
         break
       case 'all+backup':
-        operationSql = `(${pendingCreationSql} OR ${pendingUpgradeSql} OR ${migrationSql} OR ${archivingSql} OR ${restoringSql}) OR ${deletingSql}`
+        operationSql = `(${pendingCreationSql} OR ${pendingUpgradeSql} OR ${migrationSql} OR ${archivingSql} OR ${restoringSql} OR ${deletingSql})`
         break
     }
 
diff --git a/server/core/src/types.ts b/server/core/src/types.ts
index 4c49453a62..373e439fd3 100644
--- a/server/core/src/types.ts
+++ b/server/core/src/types.ts
@@ -647,6 +647,7 @@ export interface AddSessionActive {
   context: MeasureContext
   workspaceId: WorkspaceUuid
 }
+
 export type AddSessionResponse =
   | AddSessionActive
   | { upgrade: true, progress?: number }