diff --git a/tgui/packages/tgui/interfaces/Canvas.jsx b/tgui/packages/tgui/interfaces/Canvas.jsx
index 02b2ff9ecf..726acfed84 100644
--- a/tgui/packages/tgui/interfaces/Canvas.jsx
+++ b/tgui/packages/tgui/interfaces/Canvas.jsx
@@ -52,8 +52,8 @@ class PaintCanvas extends Component {
     const y_size = this.props.value[0].length;
     const x_scale = this.canvasRef.current.width / x_size;
     const y_scale = this.canvasRef.current.height / y_size;
-    const x = Math.floor(event.offsetX / x_scale) + 1;
-    const y = Math.floor(event.offsetY / y_scale) + 1;
+    const x = Math.floor(event.nativeEvent.offsetX / x_scale) + 1;
+    const y = Math.floor(event.nativeEvent.offsetY / y_scale) + 1;
     this.onCVClick(x, y);
   }
 
diff --git a/tgui/packages/tgui/interfaces/ShuttleControl.jsx b/tgui/packages/tgui/interfaces/ShuttleControl.jsx
index d22d1b6e16..2a94f4c0b1 100644
--- a/tgui/packages/tgui/interfaces/ShuttleControl.jsx
+++ b/tgui/packages/tgui/interfaces/ShuttleControl.jsx
@@ -144,7 +144,7 @@ const ShuttleControlConsoleDefault = (props) => {
 
 const ShuttleControlConsoleMulti = (props) => {
   const { act, data } = useBackend();
-  const { can_cloak, can_pick, legit, cloaked, destination_name } = data;
+  const { can_cloak, can_pick, legit, cloaked } = data;
   return (
     <>
       <ShuttleControlSharedShuttleStatus />
@@ -164,12 +164,11 @@ const ShuttleControlConsoleMulti = (props) => {
             null}
           <LabeledList.Item label="Current Destination">
             <Button
+              content={props.destination_name}
               icon="taxi"
               disabled={!can_pick}
               onClick={() => act('pick')}
-            >
-              {destination_name}
-            </Button>
+            />
           </LabeledList.Item>
         </LabeledList>
       </Section>
@@ -467,24 +466,28 @@ const ShuttleControlConsoleWeb = (props) => {
   );
 };
 
-// This may look tempting to convert to require() or some kind of dynamic call
-// Don't do it. XSS abound.
-const SubtemplateList = {
-  ShuttleControlConsoleDefault: <ShuttleControlConsoleDefault />,
-  ShuttleControlConsoleMulti: <ShuttleControlConsoleMulti />,
-  ShuttleControlConsoleExploration: <ShuttleControlConsoleExploration />,
-  ShuttleControlConsoleWeb: <ShuttleControlConsoleWeb />,
-};
-
 export const ShuttleControl = (props) => {
   const { act, data } = useBackend();
-  const { subtemplate } = data;
+  const { subtemplate, destination_name } = data;
   return (
     <Window
       width={470}
       height={subtemplate === 'ShuttleControlConsoleWeb' ? 560 : 370}
     >
-      <Window.Content>{SubtemplateList[subtemplate]}</Window.Content>
+      <Window.Content>
+        {(subtemplate === 'ShuttleControlConsoleDefault' && (
+          <ShuttleControlConsoleDefault />
+        )) ||
+          (subtemplate === 'ShuttleControlConsoleMulti' && (
+            <ShuttleControlConsoleMulti destination_name={destination_name} />
+          )) ||
+          (subtemplate === 'ShuttleControlConsoleExploration' && (
+            <ShuttleControlConsoleExploration />
+          )) ||
+          (subtemplate === 'ShuttleControlConsoleWeb' && (
+            <ShuttleControlConsoleWeb />
+          ))}
+      </Window.Content>
     </Window>
   );
 };