Some fixes
Merge branch 'poc7' of github.com:ethereum/pyethereum into poc7