Fixed 2 bugs with autoloaders