Some more changes to config.