Fix Settings sync