Fix Sync Problems