diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index 4e9b9933e68..75678124cb4 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -53,7 +53,7 @@ body:
     id: system-info
     attributes:
       label: System Info
-      description: Output of `npx envinfo --system --npmPackages '{vite,undici,@builder.io/*}' --binaries --browsers`
+      description: Output of `npx envinfo --system --npmPackages '{vite,undici,typescript,@builder.io/*}' --binaries --browsers`
       render: shell
       placeholder: System, Binaries, Browsers
     validations:
diff --git a/packages/qwik-city/runtime/src/qwik-city-component.tsx b/packages/qwik-city/runtime/src/qwik-city-component.tsx
index 9b66c85b8b9..4345eaf6a75 100644
--- a/packages/qwik-city/runtime/src/qwik-city-component.tsx
+++ b/packages/qwik-city/runtime/src/qwik-city-component.tsx
@@ -90,7 +90,9 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
   useStyles$(`:root{view-transition-name:none}`);
   const env = useQwikCityEnv();
   if (!env?.params) {
-    throw new Error(`Missing Qwik City Env Data`);
+    throw new Error(
+      `Missing Qwik City Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`
+    );
   }
 
   const urlEnv = useServerData<string>('url');
diff --git a/packages/qwik-city/runtime/src/sw-register.ts b/packages/qwik-city/runtime/src/sw-register.ts
index ccb5e211ccc..e99d6598863 100644
--- a/packages/qwik-city/runtime/src/sw-register.ts
+++ b/packages/qwik-city/runtime/src/sw-register.ts
@@ -30,26 +30,30 @@ import type { QPrefetchData, QPrefetchMessage } from './service-worker/types';
     }
   });
 
-  navigator.serviceWorker
-    .register('__url')
-    .then((reg) => {
-      initServiceWorker = () => {
-        swReg = reg;
-        queuedEventDetails.forEach(sendPrefetch!);
-        sendPrefetch!({ bundles: queuedEventDetails });
-      };
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker
+      .register('__url')
+      .then((reg) => {
+        initServiceWorker = () => {
+          swReg = reg;
+          queuedEventDetails.forEach(sendPrefetch!);
+          sendPrefetch!({ bundles: queuedEventDetails });
+        };
 
-      if (reg.installing) {
-        reg.installing.addEventListener('statechange', (ev: any) => {
-          if (ev.target.state == 'activated') {
-            initServiceWorker!();
-          }
-        });
-      } else if (reg.active) {
-        initServiceWorker!();
-      }
-    })
-    .catch((e) => console.error(e));
+        if (reg.installing) {
+          reg.installing.addEventListener('statechange', (ev: any) => {
+            if (ev.target.state == 'activated') {
+              initServiceWorker!();
+            }
+          });
+        } else if (reg.active) {
+          initServiceWorker!();
+        }
+      })
+      .catch((e) => console.error(e));
+  } else {
+    console.log('Service worker not supported in this browser.');
+  }
 })([]);
 
 interface QwikServiceWorker extends ServiceWorker {
diff --git a/starters/apps/base/src/entry.ssr.tsx b/starters/apps/base/src/entry.ssr.tsx
index d7a9839406d..e3de501302b 100644
--- a/starters/apps/base/src/entry.ssr.tsx
+++ b/starters/apps/base/src/entry.ssr.tsx
@@ -26,5 +26,8 @@ export default function (opts: RenderToStreamOptions) {
       lang: "en-us",
       ...opts.containerAttributes,
     },
+    serverData: {
+      ...opts.serverData,
+    },
   });
 }
diff --git a/starters/apps/empty/src/routes/index.tsx b/starters/apps/empty/src/routes/index.tsx
index 4fb64b5d92e..4fb7a52a837 100644
--- a/starters/apps/empty/src/routes/index.tsx
+++ b/starters/apps/empty/src/routes/index.tsx
@@ -5,11 +5,11 @@ export default component$(() => {
   return (
     <>
       <h1>Hi 👋</h1>
-      <p>
+      <div>
         Can't wait to see what you build with qwik!
         <br />
         Happy coding.
-      </p>
+      </div>
     </>
   );
 });
diff --git a/starters/apps/site-with-visual-cms/src/entry.ssr.tsx b/starters/apps/site-with-visual-cms/src/entry.ssr.tsx
index d7a9839406d..e3de501302b 100644
--- a/starters/apps/site-with-visual-cms/src/entry.ssr.tsx
+++ b/starters/apps/site-with-visual-cms/src/entry.ssr.tsx
@@ -26,5 +26,8 @@ export default function (opts: RenderToStreamOptions) {
       lang: "en-us",
       ...opts.containerAttributes,
     },
+    serverData: {
+      ...opts.serverData,
+    },
   });
 }