diff --git a/server-msg.c b/server-msg.c
index c402fc58..6de3d34c 100644
--- a/server-msg.c
+++ b/server-msg.c
@@ -1,4 +1,4 @@
-/* $Id: server-msg.c,v 1.18 2007-10-03 12:34:16 nicm Exp $ */
+/* $Id: server-msg.c,v 1.19 2007-10-03 13:07:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -398,15 +398,9 @@ server_msg_fn_bindkey(struct hdr *hdr, struct client *c)
 	if (data.flags & BIND_STRING) {
 		hdr->size -= sizeof data;
 
-		if (hdr->size != 0) {
-			str = xmalloc(hdr->size + 1);
-			buffer_read(c->in, str, hdr->size);
-			str[hdr->size] = '\0';
-		}
-		if (*str == '\0') {
-			xfree(str);
-			str = NULL;
-		}
+		str = xmemstrdup(BUFFER_OUT(c->in), hdr->size);
+		if (hdr->size > 0)
+			buffer_remove(c->in, hdr->size);
 	}
 
  	data.cmd[(sizeof data.cmd) - 1] = '\0';	
diff --git a/window.c b/window.c
index 67a37be2..ced59ffa 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.16 2007-10-03 10:18:32 nicm Exp $ */
+/* $Id: window.c,v 1.17 2007-10-03 13:07:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -104,7 +104,11 @@ window_create(const char *cmd, const char **environ, u_int sx, u_int sy)
 	screen_create(&w->screen, sx, sy);
 	input_init(&w->ictx, &w->screen);
 
-	name = xstrdup(cmd);
+	/* XXX */
+	if (strncmp(cmd, "exec ", (sizeof "exec ") - 1) == 0)
+		name = xstrdup(cmd + sizeof "exec ");
+	else
+		name = xstrdup(cmd);
 	if ((ptr = strchr(name, ' ')) != NULL) {
 		if (ptr != name && ptr[-1] != '\\')
 			*ptr = '\0';
diff --git a/xmalloc.c b/xmalloc.c
index dff43189..b7ec6698 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $Id: xmalloc.c,v 1.3 2007-09-29 14:25:49 nicm Exp $ */
+/* $Id: xmalloc.c,v 1.4 2007-10-03 13:07:42 nicm Exp $ */
 
 /*
  * Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -75,7 +75,8 @@ xmemstrdup(const char *buf, size_t len)
 	char	*s;
 
 	s = xmalloc(len + 1);
-	memcpy(s, buf, len);
+	if (len > 0)
+		memcpy(s, buf, len);
 	s[len] = '\0';
 
 	return (s);