Sync Fixes

We can remove this block if it is not necessary!