diff --git a/Makefile.in b/Makefile.in
index 3bbfe2a05f7e77d617862eaeebb0c04c7fbc4768..22907450566552698dead74d019207bd35599ebd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,7 +194,9 @@ ltm-clean:
 sizes: dropbear
 	objdump -t dropbear|grep ".text"|cut -d "." -f 2|sort -rn
 
-clean: ltc-clean ltm-clean
+clean: ltc-clean ltm-clean thisclean
+
+thisclean:
 	-rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress
 	-rm -f staticdropbear staticdropbearkey staticdropbearconvert staticscp
 	-rm -f dropbearmulti staticdropbearmulti
diff --git a/compat.c b/compat.c
index fb6e70a0786b3b3038692122e00e241f8a801b59..7e0c1ac765383d115ad1cbe6627d4c5d407b4802 100644
--- a/compat.c
+++ b/compat.c
@@ -190,7 +190,7 @@ int daemon(int nochdir, int noclose) {
 
 #ifndef HAVE_BASENAME
 
-char *basename(char *path) {
+char *basename(const char *path) {
 
 	char *foo = strrchr(path, '/');
 	return ++foo;
diff --git a/dbmulti.c b/dbmulti.c
index 8d61c5c2a83f60aec32f66077bf5b44d32f9bb01..9d76055be1d6c3d4e1206818a6c61743a0442a66 100644
--- a/dbmulti.c
+++ b/dbmulti.c
@@ -44,7 +44,8 @@ int main(int argc, char ** argv) {
 		}
 #endif
 #ifdef DBMULTI_dbclient
-		if (strcmp(progname, "dbclient") == 0) {
+		if (strcmp(progname, "dbclient") == 0
+				|| strcmp(progname, "ssh") == 0) {
 			return cli_main(argc, argv);
 		}
 #endif