fix sync issues before bulk