Fix eval errors