Other fixes to Settings