Fixes to setting page update process