Small fixes, working autoloader