diff --git a/astylerc b/astylerc
index 0b407b9fe..d4e1188eb 100644
--- a/astylerc
+++ b/astylerc
@@ -6,6 +6,6 @@ min-conditional-indent=1
 pad-oper
 pad-header
 unpad-paren
-delete-empty-lines
 align-pointer=type
-
+keep-one-line-blocks
+close-templates
diff --git a/libethereum/Executive.cpp b/libethereum/Executive.cpp
index 404cf5596..b91871c40 100644
--- a/libethereum/Executive.cpp
+++ b/libethereum/Executive.cpp
@@ -138,7 +138,7 @@ bool Executive::create(Address _sender, u256 _endowment, u256 _gasPrice, u256 _g
 	m_newAddress = right160(sha3(rlpList(_sender, m_s.transactionsFrom(_sender) - 1)));
 
 	// Set up new account...
-	m_s.m_cache[m_newAddress] = AddressState(0, m_s.balance(m_newAddress) + _endowment, h256(), h256());
+	m_s.m_cache[m_newAddress] = AddressState(0, m_s.balance(m_newAddress) + _endowment, EmptyTrie, h256());
 
 	// Execute _init.
 	m_vm = VMFace::create(VMFace::JIT, _gas).release();
diff --git a/libethereum/State.cpp b/libethereum/State.cpp
index a239697d9..f23f47398 100644
--- a/libethereum/State.cpp
+++ b/libethereum/State.cpp
@@ -1091,7 +1091,7 @@ bool State::isTrieGood(bool _enforceRefs, bool _requireNoLeftOvers) const
 				RLP r(i.second);
 				TrieDB<h256, OverlayDB> storageDB(const_cast<OverlayDB*>(&m_db), r[2].toHash<h256>());	// promise not to alter OverlayDB.
 				for (auto const& j: storageDB) { (void)j; }
-				if (!e && r[3].toHash<h256>() && m_db.lookup(r[3].toHash<h256>()).empty())
+				if (!e && r[3].toHash<h256>() != EmptySHA3 && m_db.lookup(r[3].toHash<h256>()).empty())
 					return false;
 			}
 		}