Minor fixes to settings behaviour