diff --git a/clients/upsmon.c b/clients/upsmon.c
index 1bf6939515..b31444d047 100644
--- a/clients/upsmon.c
+++ b/clients/upsmon.c
@@ -1300,7 +1300,7 @@ static void loadconfig(void)
 /* SIGPIPE handler */
 static void sigpipe(int sig)
 {
-	upsdebugx(1, "SIGPIPE: dazed and confused, but continuing...");
+	upsdebugx(1, "SIGPIPE: dazed and confused, but continuing after signal %i...", sig);
 }
 
 /* SIGQUIT, SIGTERM handler */
diff --git a/clients/upssched.c b/clients/upssched.c
index 09890561ca..8db129ea2e 100644
--- a/clients/upssched.c
+++ b/clients/upssched.c
@@ -908,9 +908,15 @@ static void checkconf(void)
 
 int main(int argc, char **argv)
 {
-	const char	*prog = xbasename(argv[0]);
+	const char	*prog = NULL;
+	/* More a use for argc to avoid warnings than a real need: */
+	if (argc > 0) {
+		xbasename(argv[0]);
+	} else {
+		xbasename("upssched");
+	}
 
-	verbose = 1;		/* TODO: remove when done testing */
+	verbose = 1;		/* TODO: remove when done testing, or add -D */
 
 	/* normally we don't have stderr, so get this going to syslog early */
 	open_syslog(prog);
diff --git a/clients/upsset.c b/clients/upsset.c
index 57ddc2daab..cf7c6a05f6 100644
--- a/clients/upsset.c
+++ b/clients/upsset.c
@@ -746,6 +746,8 @@ static void print_rw(const char *upsname, const char *varname)
 {
 	const	char	*tmp;
 
+	printf("<!-- <TR><TD>Device</TD><TD>%s</TD></TR> -->\n", upsname);
+
 	printf("<TR BGCOLOR=\"#60B0B0\" ALIGN=\"CENTER\">\n");
 
 	printf("<TD>");
diff --git a/drivers/liebert-esp2.c b/drivers/liebert-esp2.c
index 9d1fb7ce6c..ec8538f02a 100644
--- a/drivers/liebert-esp2.c
+++ b/drivers/liebert-esp2.c
@@ -536,7 +536,7 @@ static int setvar(const char *varname, const char *val)
 		return STAT_SET_HANDLED;
 	}
 */
-	upslogx(LOG_NOTICE, "setvar: unknown variable [%s]", varname);
+	upslogx(LOG_NOTICE, "setvar: unknown variable [%s] [%s]", varname, val);
 	return STAT_SET_UNKNOWN;
 }
 
diff --git a/drivers/masterguard.c b/drivers/masterguard.c
index 0180a1bf37..41f7d16856 100644
--- a/drivers/masterguard.c
+++ b/drivers/masterguard.c
@@ -64,7 +64,7 @@ static char *StringSplit( char *source, char *word, int maxlen )
 
 	word[0] = '\0';
 	len = strlen( source );
-	for( i = 0; i < len; i++ )
+	for( i = 0; i < len && wc < maxlen; i++ )
 	{
 		if( source[i] == ' ' )
 		{