Fixes cli, eval, func errors