fix sync issues