diff --git a/evmjit/libevmjit/Arith256.cpp b/evmjit/libevmjit/Arith256.cpp
index 2ec227dcc..15d18c814 100644
--- a/evmjit/libevmjit/Arith256.cpp
+++ b/evmjit/libevmjit/Arith256.cpp
@@ -416,7 +416,7 @@ namespace
 		explicit operator uint128()
 		{
 			uint128 r = lo;
-			r |= ((uint128) mid) << 64;
+			r = r + ((uint128) mid) << 64;
 			return r;
 		}
 
diff --git a/libp2p/NodeTable.h b/libp2p/NodeTable.h
index 0217c700e..23ca33661 100644
--- a/libp2p/NodeTable.h
+++ b/libp2p/NodeTable.h
@@ -168,10 +168,10 @@ public:
 	/// Returns the Node to the corresponding node id or the empty Node if that id is not found.
 	Node node(NodeId const& _id);
 	
-#ifndef BOOST_AUTO_TEST_SUITE
-private:
-#else
+#if defined(BOOST_AUTO_TEST_SUITE) || defined(_MSC_VER) // MSVC includes access specifier in symbol name
 protected:
+#else
+private:
 #endif
 	
 	/// Constants for Kademlia, derived from address space.