More autoload problems, rework zen mode