diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6385de28a..b5a93507b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -282,9 +282,6 @@ jobs:
           name: built-client
           path: photon-server/src/main/resources/web/
 
-      # Copy thinclient in as well
-      - run: cp -r photon-thinclient/* photon-server/src/main/resources/web/
-
       # Download docs artifact to resources folder.
       - uses: actions/download-artifact@v3
         with:
diff --git a/photon-thinclient/loading.gif b/photon-client/public/loading.gif
similarity index 100%
rename from photon-thinclient/loading.gif
rename to photon-client/public/loading.gif
diff --git a/photon-thinclient/thinclient.html b/photon-client/public/thinclient.html
similarity index 100%
rename from photon-thinclient/thinclient.html
rename to photon-client/public/thinclient.html
diff --git a/photon-client/src/components/common/cv-image.vue b/photon-client/src/components/common/cv-image.vue
index 72e9fb1bf..b2ccba404 100644
--- a/photon-client/src/components/common/cv-image.vue
+++ b/photon-client/src/components/common/cv-image.vue
@@ -17,6 +17,7 @@
         data() {
             return {
                 seed: 1.0,
+                src: ""
             }
         },
         computed: {
@@ -73,7 +74,7 @@
         },
         mounted() {
           var wsvs = require('../../plugins/WebsocketVideoStream');
-          this.wsStream = new wsvs.WebsocketVideoStream(this.id, this.port, window.location.host);
+          this.wsStream = new wsvs.WebsocketVideoStream(this.id, this.port, this.$address);
         },
         unmounted() {
           this.wsStream.setPort(0);
diff --git a/photon-client/src/plugins/WebsocketVideoStream.js b/photon-client/src/plugins/WebsocketVideoStream.js
index 351383405..65912a306 100644
--- a/photon-client/src/plugins/WebsocketVideoStream.js
+++ b/photon-client/src/plugins/WebsocketVideoStream.js
@@ -4,6 +4,7 @@ export class WebsocketVideoStream{
 
 
     constructor(drawDiv, streamPort, host) {
+        console.log("host " + host + " port " + streamPort)
 
         this.drawDiv = drawDiv;
         this.image = document.getElementById(this.drawDiv);
@@ -205,6 +206,7 @@ export class WebsocketVideoStream{
     }
 
     ws_onMessage(e){
+        console.log("Got message from " + this.serverAddr)
         if(typeof e.data === 'string'){
             //string data from host
             //TODO - anything to receive info here? Maybe "available streams?"
diff --git a/photon-core/src/main/java/org/photonvision/vision/videoStream/SocketVideoStreamManager.java b/photon-core/src/main/java/org/photonvision/vision/videoStream/SocketVideoStreamManager.java
index a2a30b017..258c8805f 100644
--- a/photon-core/src/main/java/org/photonvision/vision/videoStream/SocketVideoStreamManager.java
+++ b/photon-core/src/main/java/org/photonvision/vision/videoStream/SocketVideoStreamManager.java
@@ -72,7 +72,9 @@ public class SocketVideoStreamManager {
         if (port != null && port != NO_STREAM_PORT) {
             var stream = streams.get(port);
             userSubscriptions.put(user, NO_STREAM_PORT);
-            stream.removeUser();
+            if (stream != null) {
+                stream.removeUser();
+            }
         } else {
             logger.error(
                     "User attempted to unsubscribe, but had not yet previously subscribed successfully.");
diff --git a/photon-server/src/main/resources/web/docs/index.html b/photon-server/src/main/resources/web/docs/index.html
deleted file mode 100644
index 8b6b9fef1..000000000
--- a/photon-server/src/main/resources/web/docs/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Docs have not been copied!</p>
diff --git a/photon-server/src/main/resources/web/index.html b/photon-server/src/main/resources/web/index.html
index f008dfd12..988f55e6a 100644
--- a/photon-server/src/main/resources/web/index.html
+++ b/photon-server/src/main/resources/web/index.html
@@ -1 +1 @@
-<p>UI has not been copied!</p>
\ No newline at end of file
+<p>UI has not been copied!</p>