diff --git a/QnetITAP.cpp b/QnetITAP.cpp
index 716dedb..8c77b1b 100644
--- a/QnetITAP.cpp
+++ b/QnetITAP.cpp
@@ -423,9 +423,9 @@ bool CQnetITAP::ProcessGateway(const int len, const unsigned char *raw)
 			itap.type = 0x22U;
 			itap.voice.counter = counter++;
 			itap.voice.sequence = dstr.vpkt.ctrl;
-			if (log_qso && dstr.vpkt.ctrl&0x40)
+			if (log_qso && (dstr.vpkt.ctrl & 0x40))
 				printf("Sent ITAP end of stream\n");
-			else if (dstr.vpkt.ctrl > 20)
+			if ((dstr.vpkt.ctrl & ~0x40U) > 20)
 				printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", itap.voice.sequence);
 			memcpy(itap.voice.ambe, dstr.vpkt.vasd.voice, 12);
 			itap.voice.end = 0xFFU;
diff --git a/QnetRelay.cpp b/QnetRelay.cpp
index dd2ad48..17705cc 100644
--- a/QnetRelay.cpp
+++ b/QnetRelay.cpp
@@ -240,9 +240,9 @@ bool CQnetRelay::ProcessGateway(const int len, const unsigned char *raw)
 		dsrp.voice.seq = dstr.vpkt.ctrl;	// ditto
 		if (29 == len) {	// write an AMBE packet
 			dsrp.tag = 0x21U;
-			if (log_qso && dsrp.voice.seq&0x40)
+			if (log_qso && (dsrp.voice.seq & 0x40))
 				printf("Sent DSRP end of streamid=%04x\n", ntohs(dsrp.voice.id));
-			else if (dsrp.voice.seq > 20)
+			if ((dsrp.voice.seq & ~0x40U) > 20)
 				printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", dsrp.voice.seq);
 			dsrp.voice.err = 0;	// NOT SURE WHERE TO GET THIS FROM THE INPUT buf
 			memcpy(dsrp.voice.ambe, dstr.vpkt.vasd.voice, 12);
diff --git a/versions.h b/versions.h
index 0bee857..3a757a9 100644
--- a/versions.h
+++ b/versions.h
@@ -2,8 +2,8 @@
 #define IRCDDB_VERSION "QnetGateway-7.0.1"
 #define LINK_VERSION "QnetLink-6.0.0"
 #define DVAP_VERSION "QnetDVAP-5.1.1"
-#define RELAY_VERSION "QnetRelay-0.2.0"
-#define ITAP_VERSION "QnetITAP-0.1.0"
+#define RELAY_VERSION "QnetRelay-0.2.1"
+#define ITAP_VERSION "QnetITAP-0.1.1"
 #define DVRPTR_VERSION "QnetDVRPTR-5.1.0"
 #define MMDVM_VERSION "QnetGateway-MMDVM-0.1.0"
 #define ICOM_VERSION IRCDDB_VERSION