Minor changes for loading the config