Fixing autoloading issues