Various updates to configuration.