diff --git a/QnetDB.cpp b/QnetDB.cpp
index 8183b5a..49c990c 100644
--- a/QnetDB.cpp
+++ b/QnetDB.cpp
@@ -141,7 +141,7 @@ bool CQnetDB::UpdatePosition(const char *callsign, const char *maidenhead, doubl
 	if (NULL == db)
 		return false;
 	std::stringstream sql;
-	sql << "UPDATE LHEARD SET maidenhead = '" << maidenhead << "', latitude = " << latitude << ", longitude = " << longitude << ",lasttime = strftime('%s','now')) WHERE callsign='" << callsign << "';";
+	sql << "UPDATE LHEARD SET maidenhead = '" << maidenhead << "', latitude = " << latitude << ", longitude = " << longitude << ",lasttime = strftime('%s','now') WHERE callsign='" << callsign << "';";
 
 	char *eMsg;
 	if (SQLITE_OK != sqlite3_exec(db, sql.str().c_str(), NULL, 0, &eMsg))
diff --git a/QnetGateway.cpp b/QnetGateway.cpp
index b40d090..0588f22 100644
--- a/QnetGateway.cpp
+++ b/QnetGateway.cpp
@@ -2574,7 +2574,7 @@ bool CQnetGateway::Init(char *cfgfile)
 
 
 	/* Used to validate MYCALL input */
-	preg = std::regex("^(([1-9][A-Z])|([A-PR-Z][0-9])|([A-PR-Z][A-Z][0-9]))[0-9A-Z]*[A-Z]( [ A-Z0-9]*)?$", std::regex::extended);
+	preg = std::regex("^[A-PR-Z0-9]{1}[A-Z0-9]{0,1}[0-9]{1,2}[A-Z]{1,4} {0,4}[ A-Z]{1}$", std::regex::extended);
 
 	for (i=0; i<3; i++)
 	{
diff --git a/QnetTypeDefs.h b/QnetTypeDefs.h
index da09f5e..f8973e6 100644
--- a/QnetTypeDefs.h
+++ b/QnetTypeDefs.h
@@ -115,8 +115,8 @@ using SDSRP = struct dsrp_tag  	//									offset	  size
 {
 	unsigned char title[4];	// "DSRP"								 0
 	unsigned char tag;		// Poll   : 0xA							 4
-	// Header : busy ? 0x22 : 0x20
-	// Voice  : busy ? 0x23 : 0x21
+							// Header : busy ? 0x22 : 0x20
+							// Voice  : busy ? 0x23 : 0x21
 	union
 	{
 		unsigned char poll_msg[59];	// space for text				 5		variable, max is 64, including trailing null
@@ -125,8 +125,8 @@ using SDSRP = struct dsrp_tag  	//									offset	  size
 			unsigned short id;		// random id number				 5
 			unsigned char seq;		// 0x0							 7
 			unsigned char flag[3];	// 0x80 Dstar Data				 8
-			// 0x40 Dstar Repeater
-			// 0x01 Dstar Relay Unavailable
+									// 0x40 Dstar Repeater
+									// 0x01 Dstar Relay Unavailable
 			unsigned char r2[8];	// Repeater 2					11
 			unsigned char r1[8];	// Repeater 1					19
 			unsigned char ur[8];	// Your Call					27