diff --git a/.vscode/launch.json b/.vscode/launch.json
index de1c0f0d..c3af759b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -21,20 +21,6 @@
         "rust"
       ]
     },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "Launch remote veilid-server",
-      "program": "${workspaceFolder}/target/debug/veilid-server",
-      "initCommands": [
-        "platform select remote-linux",
-        "platform connect connect://127.0.0.1:6969",
-        "settings set target.inherit-env false",
-      ],
-      "sourceLanguages": [
-        "rust"
-      ]
-    },
     {
       "type": "lldb",
       "request": "attach",
diff --git a/scripts/debug.sh b/scripts/debug.sh
index a59abc54..ac8f16ad 100644
--- a/scripts/debug.sh
+++ b/scripts/debug.sh
@@ -2,4 +2,6 @@
 trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
 killall lldb-server 2> /dev/null
 echo Running lldb-server
-lldb-server platform --server --listen 127.0.0.1:6969 --gdbserver-port 6970 
+pushd /tmp > /dev/null
+sudo -u veilid lldb-server platform --server --listen 127.0.0.1:6969 --gdbserver-port 6970 
+popd > /dev/null
\ No newline at end of file
diff --git a/scripts/debug_ssh.sh b/scripts/debug_ssh.sh
index 5714980a..e7ea23b0 100755
--- a/scripts/debug_ssh.sh
+++ b/scripts/debug_ssh.sh
@@ -3,7 +3,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 SSHHOST=$1
 if [[ "$SSHHOST" == "" ]]; then
-    SSHHOST="bootstrap-1.dev.veilid.net"
+    SSHHOST="root@bootstrap-1.dev.veilid.net"
 fi
 
 echo Copying debug script
diff --git a/setup_linux.sh b/setup_linux.sh
index d164a65f..8e13f7a8 100755
--- a/setup_linux.sh
+++ b/setup_linux.sh
@@ -22,7 +22,7 @@ else
 fi
 
 # ensure Android Command Line Tools exist
-if [ -d "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" ]; then
+if [ -d "$ANDROID_SDK_ROOT/cmdline-tools" ]; then
     echo '[X] Android command line tools are installed' 
 else
     echo 'Android command line tools are not installed'