Fix for autoloading issues