Synchronization fixes.