Fix various autoload aspects