Minor fixes of synchronization