Few improvements to synchronization.