corresponding changes from cpp-ethereum
fix merge conflicts