1. Fixed Sync Bugs