Fixing autoloading issues.