minor changes in autoload definition