fix editing errors I introduced when I was cherry picking changes from my_v2_1 branch.