More synchronization fixes.