Found more sync issues, fixing.