Updates to allow current runs with direct EVM output