diff --git a/Daemon.cpp b/Daemon.cpp
index ee3dbe76..31448d3d 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -39,7 +39,7 @@ namespace i2p
 			std::unique_ptr<i2p::client::I2PControlService> m_I2PControlService;
 
 #ifdef USE_UPNP
-			UPnP m_UPnP;
+			i2p::transport::UPnP m_UPnP;
 #endif	
 		};
 
diff --git a/SAM.cpp b/SAM.cpp
index dc592f51..ee8b514a 100644
--- a/SAM.cpp
+++ b/SAM.cpp
@@ -450,7 +450,7 @@ namespace client
 		auto keys = i2p::data::PrivateKeys::CreateRandomKeys ();
 #ifdef _MSC_VER
 		size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, 
-			keys.GetPublic ().ToBase64 ().c_str (), keys.ToBase64 ().c_str ());	
+			keys.GetPublic ()->ToBase64 ().c_str (), keys.ToBase64 ().c_str ());
 #else			                        
 		size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, 
 		    keys.GetPublic ()->ToBase64 ().c_str (), keys.ToBase64 ().c_str ());
diff --git a/Win32/Win32Service.h b/Win32/Win32Service.h
index 868528f6..097cb111 100644
--- a/Win32/Win32Service.h
+++ b/Win32/Win32Service.h
@@ -2,7 +2,6 @@
 #define WIN_32_SERVICE_H__
 
 #include <thread>
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>