diff --git a/Dockerfile b/Dockerfile
index 3e2e7ee..bc99ccb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM jayfield/novnc-baseimage
+FROM ich777/novnc-baseimage
 
 RUN apt-get update && \
     apt-get -y install --no-install-recommends net-tools socat && \
diff --git a/scripts/server.sh b/scripts/server.sh
index f17a141..71c3ec4 100755
--- a/scripts/server.sh
+++ b/scripts/server.sh
@@ -5,8 +5,13 @@ RFB_PORT=59${DISPLAY_NUM}
 NOVNC_PORT=80${DISPLAY_NUM}
 
 echo Display at ${DISPLAY} with ${SCREEN_W}x${SCREEN_H}x24
-/opt/TurboVNC/bin/Xvnc ${DISPLAY} -geometry ${SCREEN_W}x${SCREEN_H} -depth 24 +xinerama -securitytypes none >/var/log/xvfb.log &
+
+# Xvnc doesn't get a chance to clean these up when the container is killed/stopped,
+# and /tmp persists across `docker restart`, so a stale lock blocks the next start.
+rm -f /tmp/.X${DISPLAY_NUM}-lock /tmp/.X11-unix/X${DISPLAY_NUM}
+
+Xvnc ${DISPLAY} -geometry ${SCREEN_W}x${SCREEN_H} -depth 24 +xinerama -securitytypes none >/var/log/xvfb.log &
 fluxbox &
-/tmp/websockify/run -D --web=/tmp/noVNC/ --cert=/tmp/novnc.pem --key=/tmp/novnc.key ${NOVNC_PORT} localhost:${RFB_PORT}
+websockify -D --web=/usr/share/novnc/ --cert=/tmp/novnc.pem --key=/tmp/novnc.key ${NOVNC_PORT} localhost:${RFB_PORT}
 socat TCP-LISTEN:60${DISPLAY_NUM},fork,bind=0.0.0.0 UNIX-CONNECT:/tmp/.X11-unix/X${DISPLAY_NUM}
 
diff --git a/scripts/signals.sh b/scripts/signals.sh
index bd48be3..515f7a5 100644
--- a/scripts/signals.sh
+++ b/scripts/signals.sh
@@ -21,5 +21,5 @@ signal_name_to_number() {
 signal_return_val() {
     SIGNAME="$1"
     SIGNUM=$(signal_name_to_number ${SIGNAME})
-    echo "128 + $SIGNUM" | bc
+    echo $((128 + SIGNUM))
 }