Start towards fixing settings sync issues.