diff --git a/src/drivers/Qt/NetPlay.cpp b/src/drivers/Qt/NetPlay.cpp
index b9bb934e..df4c08e0 100644
--- a/src/drivers/Qt/NetPlay.cpp
+++ b/src/drivers/Qt/NetPlay.cpp
@@ -563,8 +563,8 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
 			if (!version_chk_ok)
 			{
 				netPlayTextMsg<128>  errorMsg(NETPLAY_ERROR_MSG);
-				errorMsg.setFlag(netPlayTextMsgFlags::DISCONNECT);
-				errorMsg.setFlag(netPlayTextMsgFlags::ERROR);
+				errorMsg.setFlag(netPlayTextMsgFlags::Disconnect);
+				errorMsg.setFlag(netPlayTextMsgFlags::Error);
 				errorMsg.printf("Client/Host Version Mismatch:\nHost version is %i.%i.%i\nClient version is %i.%i.%i", 
 						FCEU_VERSION_MAJOR, FCEU_VERSION_MINOR, FCEU_VERSION_PATCH,
 						msg->appVersionMajor, msg->appVersionMinor, msg->appVersionPatch);
@@ -582,8 +582,8 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
 				if (!authentication_passed)
 				{
 					netPlayTextMsg<128>  errorMsg(NETPLAY_ERROR_MSG);
-					errorMsg.setFlag(netPlayTextMsgFlags::DISCONNECT);
-					errorMsg.setFlag(netPlayTextMsgFlags::ERROR);
+					errorMsg.setFlag(netPlayTextMsgFlags::Disconnect);
+					errorMsg.setFlag(netPlayTextMsgFlags::Error);
 					errorMsg.printf("Invalid Password");
 					sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
 					client->flushData();
@@ -605,8 +605,8 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
 				else
 				{
 					netPlayTextMsg<128>  errorMsg(NETPLAY_ERROR_MSG);
-					errorMsg.setFlag(netPlayTextMsgFlags::DISCONNECT);
-					errorMsg.setFlag(netPlayTextMsgFlags::ERROR);
+					errorMsg.setFlag(netPlayTextMsgFlags::Disconnect);
+					errorMsg.setFlag(netPlayTextMsgFlags::Error);
 					errorMsg.printf("Player %i role is not available", msg->playerId+1);
 					sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
 					client->flushData();
@@ -641,7 +641,7 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
 				bool opsSync   = (data.opsCrc32 == msg->opsChkSum);
 				bool ramSync   = (data.ramCrc32 == msg->ramChkSum);
 
-				client->syncOk = opsSync && ramSync;
+				client->syncOk = client->romMatch && opsSync && ramSync;
 
 				if (!client->syncOk)
 				{
@@ -737,7 +737,7 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
 			else
 			{
 				netPlayTextMsg<128>  errorMsg(NETPLAY_ERROR_MSG);
-				errorMsg.setFlag(netPlayTextMsgFlags::WARNING);
+				errorMsg.setFlag(netPlayTextMsgFlags::Warning);
 				errorMsg.printf("Host is rejected ROMs load request");
 				sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
 			}
@@ -1433,7 +1433,7 @@ void NetPlayClient::clientProcessMessage( void *msgBuf, size_t msgSize )
 			msg->toHostByteOrder();
 			FCEU_printf("NetPlay Info: %s\n", msg->getBuffer());
 
-			if (msg->isFlagSet(netPlayTextMsgFlags::DISCONNECT))
+			if (msg->isFlagSet(netPlayTextMsgFlags::Disconnect))
 			{
 				sock->disconnectFromHost();
 			}
@@ -1450,7 +1450,7 @@ void NetPlayClient::clientProcessMessage( void *msgBuf, size_t msgSize )
 	       		msgBoxTxt += tr(msg->getBuffer());
 			QMessageBox::critical( consoleWindow, tr("NetPlay Error"), msgBoxTxt, QMessageBox::Ok );
 
-			if (msg->isFlagSet(netPlayTextMsgFlags::DISCONNECT))
+			if (msg->isFlagSet(netPlayTextMsgFlags::Disconnect))
 			{
 				sock->disconnectFromHost();
 			}
diff --git a/src/drivers/Qt/NetPlayMsgDef.h b/src/drivers/Qt/NetPlayMsgDef.h
index abe3a376..4323ebf8 100644
--- a/src/drivers/Qt/NetPlayMsgDef.h
+++ b/src/drivers/Qt/NetPlayMsgDef.h
@@ -127,10 +127,10 @@ struct netPlayAuthResp
 
 struct netPlayTextMsgFlags
 {
-	static const uint32_t DISCONNECT = 0x00000001;
-	static const uint32_t      ERROR = 0x00000002;
-	static const uint32_t    WARNING = 0x00000004;
-	static const uint32_t       INFO = 0x00000008;
+	static constexpr uint32_t Disconnect = 0x00000001;
+	static constexpr uint32_t      Error = 0x00000002;
+	static constexpr uint32_t    Warning = 0x00000004;
+	static constexpr uint32_t       Info = 0x00000008;
 };
 
 template <size_t N=8>