diff --git a/bin/label b/bin/label
index e8e3e8b0..0426e354 100755
--- a/bin/label
+++ b/bin/label
@@ -1,7 +1,16 @@
 #!/bin/sh
 
+case `uname` in
+SunOS)
+	awk=nawk
+	;;
+*)
+	awk=awk
+	;;
+esac
+
 label() {
-	echo "$@" | awk '{printf("\033];%s\007", $0);}'
+	echo "$@" | $awk '{printf("\033];%s\007", $0);}'
 }
 
 label "$@"
diff --git a/src/libdraw/x11-init.c b/src/libdraw/x11-init.c
index 8d4f61c6..b81b9099 100644
--- a/src/libdraw/x11-init.c
+++ b/src/libdraw/x11-init.c
@@ -407,9 +407,8 @@ xattach(char *label)
 			r.max.x = wattr.width;
 			r.max.y = wattr.height;
 		}
-			fprint(2, "new rect %dx%d\n", r.max.x, r.max.y);
 	}else
-		fprint(2, "bad attrs\n");
+		fprint(2, "XGetWindowAttributes: bad attrs\n");
 
 	/*
 	 * Allocate our local backing store.