Autoload and other changes