Fixes for synchronization