Fix some of synchronization issues