Fixed autoload (a bit)