Fix sync issues