Fixes eval, cmd, cli, comp, graph errors