Fix up the config values, after moving them to separate file.