fixes to autoload