Core updates. fix sync issues