diff --git a/build.py b/build.py
deleted file mode 100755
index 099a8721d..000000000
--- a/build.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/python
-# cpp-ethereum build script
-# to be used from CI server, or to build locally
-# uses python instead of bash script for better cross-platform support
-
-# TODO Initial version. Needs much more improvements
-
-import argparse
-import os
-import subprocess
-
-def build_dependencies():
-   if os.path.exists("extdep"):
-       os.chdir("extdep")
-       if not os.path.exists("build"):
-            os.makedirs("build") 
-       os.chdir("build")
-       subprocess.check_call(["cmake", ".."])
-       subprocess.check_call("make")
-
-parser = argparse.ArgumentParser()
-parser.add_argument("cmd", help="what to build")
-
-args = parser.parse_args()
-if args.cmd == "dep":
-    build_dependencies()
-    
diff --git a/libdevcrypto/TrieDB.h b/libdevcrypto/TrieDB.h
index b42d67aea..3da63edf4 100644
--- a/libdevcrypto/TrieDB.h
+++ b/libdevcrypto/TrieDB.h
@@ -49,7 +49,7 @@ extern const h256 EmptyTrie;
 
 /**
  * @brief Merkle Patricia Tree "Trie": a modifed base-16 Radix tree.
- * This version uses an database backend.
+ * This version uses a database backend.
  * Usage:
  * @code
  * GenericTrieDB<MyDB> t(&myDB);
diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp
index 4cc985d65..a6267b7e9 100644
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@@ -378,6 +378,8 @@ string Host::pocHost()
 
 void Host::connect(std::string const& _addr, unsigned short _port) noexcept
 {
+	while (isWorking() && !m_run)
+		this_thread::sleep_for(chrono::milliseconds(50));
 	if (!m_run)
 		return;
 
@@ -409,6 +411,8 @@ void Host::connect(std::string const& _addr, unsigned short _port) noexcept
 
 void Host::connect(bi::tcp::endpoint const& _ep)
 {
+	while (isWorking() && !m_run)
+		this_thread::sleep_for(chrono::milliseconds(50));
 	if (!m_run)
 		return;
 
@@ -430,6 +434,8 @@ void Host::connect(bi::tcp::endpoint const& _ep)
 
 void Host::connect(std::shared_ptr<Node> const& _n)
 {
+	while (isWorking() && !m_run)
+		this_thread::sleep_for(chrono::milliseconds(50));
 	if (!m_run)
 		return;