diff --git a/Android.mk b/Android.mk
index b95d5dd..3a80e1f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
 LOCAL_STATIC_LIBRARIES := libtommath libtomcrypt
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := ssh
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/libtommath 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/libtomcrypt/src/headers
diff --git a/cli-main.c b/cli-main.c
index 68cf023..106006b 100644
--- a/cli-main.c
+++ b/cli-main.c
@@ -47,6 +47,8 @@
 	_dropbear_exit = cli_dropbear_exit;
 	_dropbear_log = cli_dropbear_log;
 
+	putenv("HOME=/data/local");
+
 	disallow_core();
 
 	cli_getopts(argc, argv);
diff --git a/options.h b/options.h
index 0533f24..7625151 100644
--- a/options.h
+++ b/options.h
@@ -203,7 +203,7 @@
 
 /* This is used by the scp binary when used as a client binary. If you're
  * not using the Dropbear client, you'll need to change it */
-#define _PATH_SSH_PROGRAM "/system/bin/ssh"
+#define _PATH_SSH_PROGRAM "/system/xbin/ssh"
 
 /* Whether to log commands executed by a client. This only logs the 
  * (single) command sent to the server, not what a user did in a