diff --git a/libethcore/BlockInfo.cpp b/libethcore/BlockInfo.cpp
index 266f57cc8..8e2e2c4c4 100644
--- a/libethcore/BlockInfo.cpp
+++ b/libethcore/BlockInfo.cpp
@@ -186,7 +186,7 @@ void BlockInfo::populateFromParent(BlockInfo const& _parent)
 	m_gasLimit = selectGasLimit(_parent);
 	m_gasUsed = 0;
 	m_difficulty = calculateDifficulty(_parent);
-	m_parentHash = _parent.hash();
+	m_parentHash = _parent.m_hash;
 }
 
 u256 BlockInfo::selectGasLimit(BlockInfo const& _parent) const
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 4a6507cd6..d44545145 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1188,7 +1188,7 @@ BOOST_AUTO_TEST_CASE(now)
 {
 	char const* sourceCode = "contract test {\n"
 							 "  function someInfo() returns (bool success) {\n"
-							 "    return block.timestamp() == now && now > 0;\n"
+							 "    return block.timestamp == now && now > 0;\n"
 							 "  }\n"
 							 "}\n";
 	compileAndRun(sourceCode);
diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h
index f4dbbcb97..0e8637012 100644
--- a/test/libsolidity/solidityExecutionFramework.h
+++ b/test/libsolidity/solidityExecutionFramework.h
@@ -41,7 +41,11 @@ namespace test
 class ExecutionFramework
 {
 public:
-	ExecutionFramework() { g_logVerbosity = 0; }
+	ExecutionFramework()
+	{
+		g_logVerbosity = 0;
+		m_state.resetCurrent();
+	}
 
 	bytes const& compileAndRunWithoutCheck(
 		std::string const& _sourceCode,