diff --git a/modules/pi_control/assets/console.js b/modules/pi_control/assets/console.js
index 9388c5a..17fb75c 100644
--- a/modules/pi_control/assets/console.js
+++ b/modules/pi_control/assets/console.js
@@ -47,7 +47,7 @@
       if (!win) return false;
       const term = win.term || win.xterm || win.terminal;
       if (term && typeof term.write === 'function') {
-        term.write(command + '\r');
+        term.write(command + '\r\n');
         return true;
       }
     } catch (e) {
diff --git a/tools/pi_control/terminal_entry.sh b/tools/pi_control/terminal_entry.sh
index 624e1ab..04481ba 100644
--- a/tools/pi_control/terminal_entry.sh
+++ b/tools/pi_control/terminal_entry.sh
@@ -55,7 +55,7 @@ fi
 SSH_TARGET="${USER}@${HOST}"
 if [[ -n "${COMMAND}" ]]; then
   COMMAND_B64="$(printf '%s' "${COMMAND}" | base64)"
-  REMOTE_CMD='CMD_B64="$1"; CMD="$(printf "%s" "${CMD_B64}" | base64 -d)"; eval "${CMD}"; exec /bin/bash -il'
+  REMOTE_CMD='CMD_B64="$0"; CMD="$(printf "%s" "${CMD_B64}" | base64 -d)"; eval "${CMD}"; exec /bin/bash -il'
   if [[ "${AUTH_TYPE}" == "key" && -n "${KEY_PATH}" ]]; then
     exec ssh "${SSH_OPTS[@]}" -i "${KEY_PATH}" -p "${PORT:-22}" -tt "${SSH_TARGET}" -- /bin/bash -lc "${REMOTE_CMD}" -- "${COMMAND_B64}" || \
       exec ssh "${SSH_OPTS[@]}" -i "${KEY_PATH}" -p "${PORT:-22}" -tt "${SSH_TARGET}" -- /bin/sh -lc "${REMOTE_CMD}" -- "${COMMAND_B64}"