Improved application of settings.