Synchronization fixes