Fix some settings not updating.

Change-Id: I8fd02a394935108e2b010d28c7ae899b5ec0ba5c