Improvements to config.