- small autoload changes