Tweaks to the synchronization logic