diff --git a/FAQ b/FAQ
index 71e652cf..c5edd8c1 100644
--- a/FAQ
+++ b/FAQ
@@ -69,7 +69,10 @@ Your terminal has asked to only be resized in certain increments,
 and there's not enough space for another row. `wmii` is forced to
 compromise and leave blank space around it. If you'd rather wmii to
 ignore the terminal's request, write 'incmode ignore'[5] to the /ctl
-virtual file.
+virtual file. Note, though, that this will prevent `wmii`'s normal
+behavior of trying to keep these increment gaps as small as
+possible, and will therefore result in more wasted space than
+otherwise.
 
 10. On FreeBSD, using p9p[6], I get an error about not being able to open /dev/fd/7.
 ------------------------------------------------------------------------------------
diff --git a/cmd/wmii/main.c b/cmd/wmii/main.c
index 30fd9674..1dbe5e78 100644
--- a/cmd/wmii/main.c
+++ b/cmd/wmii/main.c
@@ -334,6 +334,8 @@ main(int argc, char *argv[]) {
 	char *wmiirc;
 	int i;
 
+	IXP_ASSERT_VERSION;
+
 	setlocale(LC_CTYPE, "");
 	fmtinstall('r', errfmt);
 	fmtinstall('a', afmt);
diff --git a/cmd/wmiir.c b/cmd/wmiir.c
index 43cf4b51..79692d56 100644
--- a/cmd/wmiir.c
+++ b/cmd/wmiir.c
@@ -515,6 +515,8 @@ main(int argc, char *argv[]) {
 	exectab *tab;
 	int ret;
 
+	IXP_ASSERT_VERSION;
+
 	setlocale(LC_ALL, "");
 	binary = utf8locale();
 
diff --git a/cmd/x11/wikeyname.c b/cmd/x11/wikeyname.c
index b4188f73..6e25ac40 100644
--- a/cmd/x11/wikeyname.c
+++ b/cmd/x11/wikeyname.c
@@ -15,7 +15,7 @@ static int	nkeys;
 
 static void
 usage(void) {
-	fprint(2, "usage: wikeyname\n");
+	lprint(2, "usage: wikeyname\n");
 	exit(1);
 }
 
@@ -25,6 +25,9 @@ main(int argc, char *argv[]) {
 	setlocale(LC_CTYPE, "");
 
 	ARGBEGIN{
+	case 'v':
+		lprint(2, version);
+		return 0;
 	default: usage();
 	}ARGEND;
 
diff --git a/lib/libstuff/clientutil.c b/lib/libstuff/clientutil.c
index 4a0d7792..75541003 100644
--- a/lib/libstuff/clientutil.c
+++ b/lib/libstuff/clientutil.c
@@ -44,6 +44,8 @@ readctl(char *key) {
 
 void
 client_init(char* address) {
+	IXP_ASSERT_VERSION;
+
 	if(address == nil)
 		address = getenv("WMII_ADDRESS");
 	if(address && *address)