Fixing up the config