Various patches relating to configuration.