More improvements to settings update code.