Minor changes to improve configuration.