diff --git a/cmd/wm/fs.c b/cmd/wm/fs.c
index dee8c2e2..2343604e 100644
--- a/cmd/wm/fs.c
+++ b/cmd/wm/fs.c
@@ -291,8 +291,9 @@ message_root(char *message)
 	}if(!strncmp(message, "testtags ", 9)) {
 		message += 9;
 		free(def.testtags);
-		def.testtags = strdup(message);
+		def.testtags = strlen(message) ? strdup(message) : nil;
 		draw_frames();
+		return nil;
 	}
 	return Ebadcmd;
 }
diff --git a/liblitz/input.c b/liblitz/input.c
index 80a0c1d1..5a7405af 100644
--- a/liblitz/input.c
+++ b/liblitz/input.c
@@ -60,7 +60,8 @@ xget_fontmetric(BlitzInput *i, int *x, int *y, unsigned int *w, unsigned int *h)
 {
 	*w = i->font->rbearing - i->font->lbearing;
 	*h = i->font->ascent + i->font->descent;
-	*x = i->rect.x + (i->rect.width - *w) / 2;;
+	/* XXX: This is a temporary hack */
+	*x = i->rect.x + (i->rect.height - *h) / 2 + i->font->rbearing;
 	*y = i->rect.y + (i->rect.height - *h) / 2 + i->font->ascent;
 }