Fixed more sync issues with 4.2.2

Fixed more sync issues with 4.2.2