diff --git a/client/CServerHandler.cpp b/client/CServerHandler.cpp
index 93d44cefa..f4904c26c 100644
--- a/client/CServerHandler.cpp
+++ b/client/CServerHandler.cpp
@@ -23,9 +23,7 @@
 
 #ifdef VCMI_ANDROID
 #include "../lib/CAndroidVMHelper.h"
-#elif defined(VCMI_IOS)
-//TODO
-#else
+#elif !defined(VCMI_IOS)
 #include "../lib/Interprocess.h"
 #endif
 #include "../lib/CConfigHandler.h"
@@ -184,7 +182,7 @@ void CServerHandler::startLocalServerAndConnect()
 		envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
 	}
 #elif defined(VCMI_IOS)
-	// TODO
+	// todo ios
 #else
 	threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
 #endif
@@ -202,7 +200,7 @@ void CServerHandler::startLocalServerAndConnect()
 	logNetwork->info("waiting for server finished...");
 	androidTestServerReadyFlag = false;
 #elif defined(VCMI_IOS)
-	//TODO
+    // todo ios
 #else
 	if(shm)
 		shm->sr->waitTillReady();
diff --git a/lib/serializer/Connection.cpp b/lib/serializer/Connection.cpp
index 30bc4e83b..cd98406b4 100644
--- a/lib/serializer/Connection.cpp
+++ b/lib/serializer/Connection.cpp
@@ -71,7 +71,8 @@ CConnection::CConnection(std::string host, ui16 port, std::string Name, std::str
 	boost::system::error_code error = asio::error::host_not_found;
 	socket = std::make_shared<tcp::socket>(*io_service);
 	tcp::resolver resolver(*io_service);
-	tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port)),error);
+    // todo ios: is new param really needed?
+	tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port), resolver_query_base::numeric_service), error);
 	if(error)
 	{
 		logNetwork->error("Problem with resolving: \n%s", error.message());
diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
index aa6f5ed82..142bac68c 100644
--- a/server/CVCMIServer.cpp
+++ b/server/CVCMIServer.cpp
@@ -29,9 +29,7 @@
 #include "../lib/rmg/CMapGenOptions.h"
 #ifdef VCMI_ANDROID
 #include "lib/CAndroidVMHelper.h"
-#elif defined(VCMI_IOS)
-// todo ios
-#else
+#elif !defined(VCMI_IOS)
 #include "../lib/Interprocess.h"
 #endif
 #include "../lib/VCMI_Lib.h"