A few changes/fix for synchronization