Epoch, eval and error code changes