diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index 05e4535fc..c5d1aa0be 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -89,6 +89,7 @@ elseif ("${TARGET_PLATFORM}" STREQUAL "w64")
 	target_link_libraries(${EXECUTEABLE} crypt32)
 	target_link_libraries(${EXECUTEABLE} Qt5PlatformSupport)
 	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+elseif (UNIX)
 else ()
 	target_link_libraries(${EXECUTEABLE} boost_system)
 	target_link_libraries(${EXECUTEABLE} boost_filesystem)
diff --git a/libethereum/EthereumHost.cpp b/libethereum/EthereumHost.cpp
index 1b3049fba..f9fe45eb0 100644
--- a/libethereum/EthereumHost.cpp
+++ b/libethereum/EthereumHost.cpp
@@ -183,7 +183,7 @@ void EthereumHost::doWork()
 
 void EthereumHost::maintainTransactions(TransactionQueue& _tq, h256 _currentHash)
 {
-	bool resendAll = (_currentHash != m_latestBlockSent);
+	bool resendAll = (m_grabbing == Grabbing::Nothing && m_chain.isKnown(m_latestBlockSent) && _currentHash != m_latestBlockSent);
 	{
 		lock_guard<recursive_mutex> l(m_incomingLock);
 		for (auto it = m_incomingTransactions.begin(); it != m_incomingTransactions.end(); ++it)
@@ -251,7 +251,7 @@ void EthereumHost::maintainBlocks(BlockQueue& _bq, h256 _currentHash)
 	}
 
 	// If we've finished our initial sync send any new blocks.
-	if (m_grabbing == Grabbing::Nothing && m_chain.details(m_latestBlockSent) && m_chain.details(m_latestBlockSent).totalDifficulty < m_chain.details(_currentHash).totalDifficulty)
+	if (m_grabbing == Grabbing::Nothing && m_chain.isKnown(m_latestBlockSent) && m_chain.details(m_latestBlockSent).totalDifficulty < m_chain.details(_currentHash).totalDifficulty)
 	{
 		RLPStream ts;
 		EthereumPeer::prep(ts);
diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp
index 9d033e6f8..2517002ea 100644
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@@ -381,6 +381,7 @@ void Host::connect(std::string const& _addr, unsigned short _port) noexcept
 			}
 			else
 				connect(bi::tcp::endpoint(bi::address::from_string(_addr), _port));
+			break;
 		}
 		catch (exception const& e)
 		{
diff --git a/libqethereum/CMakeLists.txt b/libqethereum/CMakeLists.txt
index 00ac6b5d6..68ee1bb9d 100644
--- a/libqethereum/CMakeLists.txt
+++ b/libqethereum/CMakeLists.txt
@@ -99,6 +99,7 @@ elseif ("${TARGET_PLATFORM}" STREQUAL "w64")
 	target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s)
 	target_link_libraries(${EXECUTABLE} Qt5PlatformSupport)
 	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+elseif (UNIX)
 else ()
 	target_link_libraries(${EXECUTABLE} boost_system)
 	target_link_libraries(${EXECUTABLE} boost_filesystem)
diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj
index c87eaebcc..134171843 100644
--- a/windows/LibEthereum.vcxproj
+++ b/windows/LibEthereum.vcxproj
@@ -293,18 +293,11 @@
     <ClInclude Include="..\libethereum\EthereumPeer.h" />
     <ClInclude Include="..\libethereum\Executive.h" />
     <ClInclude Include="..\libethereum\ExtVM.h" />
-<<<<<<< HEAD
-    <ClInclude Include="..\libethereum\Manifest.h" />
-    <ClInclude Include="..\libethereum\PeerNetwork.h" />
-    <ClInclude Include="..\libethereum\PeerServer.h" />
-    <ClInclude Include="..\libethereum\PeerSession.h" />
-=======
     <ClInclude Include="..\libethereum\Interface.h" />
     <ClInclude Include="..\libethereum\Manifest.h" />
     <ClInclude Include="..\libethereum\MessageFilter.h" />
     <ClInclude Include="..\libethereum\Miner.h" />
     <ClInclude Include="..\libethereum\PastMessage.h" />
->>>>>>> develop
     <ClInclude Include="..\libethereum\State.h" />
     <ClInclude Include="..\libethereum\Transaction.h" />
     <ClInclude Include="..\libethereum\TransactionQueue.h" />