Fix autoloading problems