Better handling of synced settings