fixes to Settings