diff --git a/package-lock.json b/package-lock.json
index abf6c85..799a746 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10953,7 +10953,7 @@
     },
     "node_modules/protobuf-ts": {
       "version": "1.0.0",
-      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#c08965a296f2cd0799472fd8b163186cf6885d4c",
+      "resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#a646dbd472f266154f8c5f44146e0b27ccdda28f",
       "dependencies": {
         "protobufjs": "^6.8.8"
       }
diff --git a/src/common/DeviceLinkDrawer.tsx b/src/common/DeviceLinkDrawer.tsx
index b01113c..e5d6fd8 100644
--- a/src/common/DeviceLinkDrawer.tsx
+++ b/src/common/DeviceLinkDrawer.tsx
@@ -21,6 +21,7 @@ import { pond } from "protobuf-ts/pond";
 import React, { useEffect, useState } from "react";
 import { makeStyles } from "@mui/styles";
 import { useGlobalState } from "providers";
+import { getContextKeys, getContextTypes } from "pbHelpers/Context";
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -116,13 +117,7 @@ export default function DeviceLinkDrawer(props: Props) {
         undefined,
         undefined,
         undefined,
-        true,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        as
+        true
       )
       .then(resp => {
         let devMap = new Map<string, pond.ComprehensiveDevice>();
diff --git a/src/objectHeater/ObjectHeaterCard.tsx b/src/objectHeater/ObjectHeaterCard.tsx
index 651ae7c..92e899e 100644
--- a/src/objectHeater/ObjectHeaterCard.tsx
+++ b/src/objectHeater/ObjectHeaterCard.tsx
@@ -109,7 +109,7 @@ export default function ObjectHeaterCard(props: Props) {
           });
       }
     }
-    if (heaterData.devices[0]) {
+    if (heaterData.devices && heaterData.devices[0]) {
       setConnectedDevice(Device.any(heaterData.devices[0].device));
       heaterData.devices[0].components.forEach(c => {
         //loop through the components and assign them accordingly
@@ -171,7 +171,7 @@ export default function ObjectHeaterCard(props: Props) {
 
   const goToHeater = () => {
     //history.push("/objectHeaters/" + heater.key);
-    let path = "/objectHeaters/" + heater.key;
+    let path = "/heaters/" + heater.key;
     navigate(path, { state: {heater: heater} });
   };
 
diff --git a/src/pages/Site.tsx b/src/pages/Site.tsx
index 2685f4d..b09de66 100644
--- a/src/pages/Site.tsx
+++ b/src/pages/Site.tsx
@@ -56,8 +56,8 @@ export default function Site() {
       siteAPI
         .getSitePage(siteKey, as)
         .then(resp => {
-          setSite(ISite.any(resp.data.site));
-          setHeaters(resp.data.heaterData);
+          if(resp.data.site) setSite(ISite.any(resp.data.site));
+          if(resp.data.heaterData) setHeaters(resp.data.heaterData);
           setLoadingSite(false);
         })
         .catch(err => {