synchronization fixes for fork mode