Merge "Misc fixes for Settings"