Fixes eval, func errors