Fixes errors in eval