Improved sync issues