Fixing synchronization problems