diff --git a/Dockerfile b/Dockerfile
index 39887e465..ddde77fc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,7 @@ RUN set -x \
     && apk add --no-cache curl
 
 # Script dependencies
-RUN pnpm add npm-run-all dotenv chalk semver prisma@6.18.0 @prisma/adapter-pg@6.18.0
+RUN pnpm add npm-run-all dotenv chalk semver prisma@6.16.3 @prisma/adapter-pg@6.16.3
 
 # Permissions for prisma
 RUN chown -R nextjs:nodejs node_modules/.pnpm/
diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index c5528465d..16ff97da2 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -30,18 +30,10 @@ const PROVIDER_HEADERS = [
   },
 ];
 
-export function getDevice(userAgent: string, screen: string = '') {
+export function getDevice(userAgent: string) {
   const { device } = UAParser(userAgent);
 
-  const [width] = screen.split('x');
-
-  const type = device?.type || 'desktop';
-
-  if (type === 'desktop' && screen && +width <= 1920) {
-    return 'laptop';
-  }
-
-  return type;
+  return device?.type || 'desktop';
 }
 
 function getRegionCode(country: string, region: string) {
@@ -116,7 +108,7 @@ export async function getClientInfo(request: Request, payload: Record<string, an
   const city = safeDecodeURIComponent(location?.city);
   const browser = browserName(userAgent);
   const os = detectOS(userAgent) as string;
-  const device = getDevice(userAgent, payload?.screen);
+  const device = getDevice(userAgent);
 
   return { userAgent, browser, os, ip, country, region, city, device };
 }
diff --git a/src/lib/ip.ts b/src/lib/ip.ts
index a818f03d7..170701505 100644
--- a/src/lib/ip.ts
+++ b/src/lib/ip.ts
@@ -1,16 +1,19 @@
+// The order here is important and influences how IPs are detected by lib/detect.ts
+// Please do not change the order unless you know exactly what you're doing - read https://developers.cloudflare.com/fundamentals/reference/http-headers/
 export const IP_ADDRESS_HEADERS = [
-  'x-real-ip',
-  'x-forwarded-for',
-  'cf-connecting-ip', // Cloudflare
-  'fastly-client-ip', // Fastly
-  'true-client-ip', // Akamai
-  'x-nf-client-connection-ip', // Netlify
-  'do-connecting-ip', // Digital Ocean
-  'x-appengine-user-ip', // Google App Ending
   'x-client-ip',
+  'x-forwarded-for',
+  'cf-connecting-ip', // This should be *after* x-forwarded-for, so that x-forwarded-for is respected if present
+  'do-connecting-ip',
+  'fastly-client-ip',
+  'true-client-ip',
+  'x-real-ip',
   'x-cluster-client-ip',
   'x-forwarded',
   'forwarded',
+  'x-appengine-user-ip',
+  'x-nf-client-connection-ip',
+  'x-real-ip',
 ];
 
 export function getIpAddress(headers: Headers) {