More synchronization fixes