Small changes to autoloader.