Fixing the loader autoloading and config merge.