Small fixes to settings, merged