Autoloader fixed

Small changes in autoload.