diff --git a/scripts/camViewer b/scripts/camViewer
index 3c5f0668..4741dca4 100755
--- a/scripts/camViewer
+++ b/scripts/camViewer
@@ -302,6 +302,8 @@ if [ "$CAMNUM" -eq 0 ]; then
         CAMNAME=GigE_Questar1
     elif [ "$hutch" = "lfe" ]; then
         CAMNAME=xrt_spec
+    elif [ "$hutch" = "xrt" ]; then
+        CAMNAME=xrt_spec
     elif [ "$hutch" = "ued" ]; then
         CAMNAME=ued-gige-01
     else
@@ -385,13 +387,14 @@ else
 fi
 
 if [[ -z "$IS_REMOTE_SSH" ]]; then
-    if [ "$hutch" == "kfe" ]; then
+    current_host="$(hostname)"
+    if [[ "$hutch" == "kfe" && "$current_host" != "kfe-console" && "$current_host" != "xbdo-control" ]]; then
         echo "Not in SSH, connecting to kfe-console..." >&2
         ssh -t kfe-console "IS_REMOTE_SSH=1 $EXE --camerapv '$CAMPVFULL' --instrument '$hutch' --pvlist '$PVLIST' --rate '$RATE' ; bash"
         exit_status=$?
         echo "SSH exit status: $exit_status" >&2
         exit $exit_status
-    elif [ "$hutch" == "lfe" ]; then
+    elif [[ ("$hutch" == "lfe" || "$hutch" == "xrt") && "$current_host" != "lfe-console" && "$current_host" != "xbdo-control" ]]; then
         echo "Not in SSH, connecting to lfe-console..." >&2
         ssh -t lfe-console "IS_REMOTE_SSH=1 $EXE --camerapv '$CAMPVFULL' --instrument '$hutch' --pvlist '$PVLIST' --rate '$RATE' ; bash"
         exit_status=$?
diff --git a/scripts/verify-hutch b/scripts/verify-hutch
index 71cb065b..547fbd19 100755
--- a/scripts/verify-hutch
+++ b/scripts/verify-hutch
@@ -20,7 +20,7 @@ if [[ ($1 == "--help") || ($1 == "-h") ]]; then
 fi
 
 hutch=${1,,}
-for i in "tmo" "txi" "rix" "xpp" "xcs" "mfx" "cxi" "mec" "ued" "ued" "det" "lfe" "kfe" "tst" "las" "hpl"; do
+for i in "tmo" "txi" "rix" "xpp" "xcs" "mfx" "cxi" "mec" "ued" "ued" "det" "lfe" "kfe" "xrt" "tst" "las" "hpl"; do
     if [[ $hutch == "$i" ]]; then
         exit 0
     fi