fix(sync): add two minor changes that made it to g3 without sync