Minor fixes to settings