Other fixes due to unification
Fix multiple errors since unification which prevented the sync from working