More autoloading fixes