diff --git a/apps/api/libs/database/src/models.rs b/apps/api/libs/database/src/models.rs
index c19d1bb22..20aa970f3 100644
--- a/apps/api/libs/database/src/models.rs
+++ b/apps/api/libs/database/src/models.rs
@@ -335,6 +335,7 @@ pub struct Collection {
 
 #[derive(Queryable, Insertable, Identifiable, Debug, Clone, Serialize, Deserialize)]
 #[diesel(table_name = organizations)]
+#[serde(rename_all = "camelCase")]
 pub struct Organization {
     pub id: Uuid,
     pub name: String,
diff --git a/apps/web/src/context/BusterReactQuery/BusterReactQueryAndApi.tsx b/apps/web/src/context/BusterReactQuery/BusterReactQueryAndApi.tsx
index 3789d29f5..832570e89 100644
--- a/apps/web/src/context/BusterReactQuery/BusterReactQueryAndApi.tsx
+++ b/apps/web/src/context/BusterReactQuery/BusterReactQueryAndApi.tsx
@@ -13,6 +13,9 @@ import { useSupabaseContext } from '../Supabase/SupabaseContextProvider';
 import { persistOptions } from './createPersister';
 import { getQueryClient } from './getQueryClient';
 
+const ENABLE_TANSTACK_PANEL =
+  process.env.NEXT_ENABLE_TANSTACK_PANEL === 'true' || process.env.NODE_ENV === 'development';
+
 const ReactQueryDevtools = dynamic(
   () =>
     import('@tanstack/react-query-devtools').then((d) => ({
@@ -66,7 +69,7 @@ export const BusterReactQueryProvider = ({ children }: { children: React.ReactNo
       e.stopPropagation();
       setIsDevToolsOpen((prev) => !prev);
     },
-    { enabled: process.env.NEXT_ENABLE_TANSTACK_PANEL === 'true' }
+    { enabled: ENABLE_TANSTACK_PANEL }
   );
 
   return (
diff --git a/packages/access-controls/src/access-controls.test.ts b/packages/access-controls/src/access-controls.test.ts
index 645f6090e..59f069c66 100644
--- a/packages/access-controls/src/access-controls.test.ts
+++ b/packages/access-controls/src/access-controls.test.ts
@@ -16,9 +16,9 @@ const createChainableMock = () => {
     'selectDistinct',
   ];
 
-  methods.forEach((method) => {
+  for (const method of methods) {
     mock[method] = vi.fn().mockReturnValue(mock);
-  });
+  }
 
   // Override specific methods that should return data
   mock._resolveWith = (data: any) => {
diff --git a/packages/database/package.json b/packages/database/package.json
index 50e5e1ff1..44cc9cb65 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -47,11 +47,9 @@
   "dependencies": {
     "@buster/typescript-config": "workspace:*",
     "@buster/vitest-config": "workspace:*",
-    "@types/pg": "^8.15.4",
     "ai": "catalog:",
     "drizzle-kit": "^0.31.4",
     "drizzle-orm": "catalog:",
-    "pg": "^8.16.3",
     "postgres": "^3.4.7",
     "zod": "catalog:"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b82bcc1e..949b4bbca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -750,9 +750,6 @@ importers:
       '@buster/vitest-config':
         specifier: workspace:*
         version: link:../vitest-config
-      '@types/pg':
-        specifier: ^8.15.4
-        version: 8.15.4
       ai:
         specifier: 'catalog:'
         version: 4.3.16(react@18.3.1)(zod@3.25.1)
@@ -762,9 +759,6 @@ importers:
       drizzle-orm:
         specifier: 'catalog:'
         version: 0.44.2(@opentelemetry/api@1.9.0)(@types/pg@8.15.4)(mysql2@3.14.1)(pg@8.16.3)(postgres@3.4.7)
-      pg:
-        specifier: ^8.16.3
-        version: 8.16.3
       postgres:
         specifier: ^3.4.7
         version: 3.4.7
@@ -17065,14 +17059,14 @@ snapshots:
       msw: 2.10.3(@types/node@20.19.4)(typescript@5.8.3)
       vite: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)
 
-  '@vitest/mocker@3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))':
+  '@vitest/mocker@3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
       msw: 2.10.3(@types/node@24.0.10)(typescript@5.8.3)
-      vite: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)
+      vite: 6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)
 
   '@vitest/pretty-format@2.0.5':
     dependencies:
@@ -23625,7 +23619,7 @@ snapshots:
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))
+      '@vitest/mocker': 3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4