diff --git a/tools/atrf-proxy/atrf-proxy.c b/tools/atrf-proxy/atrf-proxy.c
index 919cde4..d815df6 100644
--- a/tools/atrf-proxy/atrf-proxy.c
+++ b/tools/atrf-proxy/atrf-proxy.c
@@ -169,7 +169,7 @@ static int cmd_more(struct atrf_dsc *dsc, struct netio *netio, const char *cmd)
 		return netio_printf(netio, "+0x%02x\n", res);
 	}
 	if (!strcasecmp(cmd, "wait")) {
-		uint8_t res;
+		int res;
 
 		if (!n)
 			n = 1;
diff --git a/tools/atrf-xmit/atrf-xmit.c b/tools/atrf-xmit/atrf-xmit.c
index 676ed77..c023049 100644
--- a/tools/atrf-xmit/atrf-xmit.c
+++ b/tools/atrf-xmit/atrf-xmit.c
@@ -1,5 +1,5 @@
 /*
- * atrf-ber/atrf-ber.c - Fast transmission test
+ * atrf-xmit/atrf-xmit.c - Fast transmission test
  *
  * Written 2011 by Werner Almesberger
  * Copyright 2011 Werner Almesberger
diff --git a/tools/lib/atnet.c b/tools/lib/atnet.c
index 41e17ae..1270c72 100644
--- a/tools/lib/atnet.c
+++ b/tools/lib/atnet.c
@@ -474,7 +474,7 @@ int atnet_interrupt_wait(void *handle, int timeout_ms)
 	if (dialog(dsc, "WAIT %d", timeout_ms) < 0)
 		return 0;
 	value = strtoul(dsc->reply+1, &end, 0);
-	if (*end || value > 1) {
+	if (*end || value > 0xff) {
 		fprintf(stderr, "invalid response \"%s\"\n", dsc->reply+1);
 		dsc->error = 1;
 		return 0;