Fix weird autoloading problems