synchronization fixes