Fixed EVM environment. Closes #215