Enhancements for Settings.