More setting sync/resetting fixes