diff --git a/DMRGateway.vcxproj b/DMRGateway.vcxproj
index 6436d99..9276e93 100644
--- a/DMRGateway.vcxproj
+++ b/DMRGateway.vcxproj
@@ -177,6 +177,7 @@
     <ClInclude Include="PassAllTG.h" />
     <ClInclude Include="QR1676.h" />
     <ClInclude Include="Reflectors.h" />
+    <ClInclude Include="RemoteControl.h" />
     <ClInclude Include="Rewrite.h" />
     <ClInclude Include="RewriteDstId.h" />
     <ClInclude Include="RewriteDynTGNet.h" />
@@ -223,6 +224,7 @@
     <ClCompile Include="PassAllTG.cpp" />
     <ClCompile Include="QR1676.cpp" />
     <ClCompile Include="Reflectors.cpp" />
+    <ClCompile Include="RemoteControl.cpp" />
     <ClCompile Include="Rewrite.cpp" />
     <ClCompile Include="RewriteDstId.cpp" />
     <ClCompile Include="RewriteDynTGNet.cpp" />
diff --git a/DMRGateway.vcxproj.filters b/DMRGateway.vcxproj.filters
index 3f9fdc3..66c48ee 100644
--- a/DMRGateway.vcxproj.filters
+++ b/DMRGateway.vcxproj.filters
@@ -146,6 +146,9 @@
     <ClInclude Include="APRSWriter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="RemoteControl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Conf.cpp">
@@ -274,5 +277,8 @@
     <ClCompile Include="APRSWriter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="RemoteControl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RemoteControl.cpp b/RemoteControl.cpp
index 0d4ad07..3e495e9 100644
--- a/RemoteControl.cpp
+++ b/RemoteControl.cpp
@@ -111,9 +111,9 @@ REMOTE_COMMAND CRemoteControl::getCommand()
 			}
 
 			m_command = RCD_CONNECTION_STATUS;
-		}
-		else
+		} else {
 			replyStr = "KO";
+		}
 
 		::snprintf(buffer, BUFFER_LENGTH * 2, "%s remote command of \"%s\" received", ((m_command == RCD_NONE) ? "Invalid" : "Valid"), command);
 		if (m_command == RCD_NONE) {
@@ -123,7 +123,7 @@ REMOTE_COMMAND CRemoteControl::getCommand()
 			LogMessage(buffer);
 		}
 
-		m_socket.write((unsigned char*)replyStr.c_str(), replyStr.length(), address, addrlen);
+		m_socket.write((unsigned char*)replyStr.c_str(), (unsigned int)replyStr.length(), address, addrlen);
 	}
 	
 	return m_command;