Fixes eval, comp errors