Fixed autoloading issues