I've got a new thing to fix in Ep III. In order to further resolve PT/OT continuity, it's going to require that R2's mind be wiped. I think it can be done in the audio alone.

I think I can modify Organa's line to say "Have the droids' minds wiped" by removing "protocol" and make "mind" plural using the "ds" from "droid's." I think this will work, but I don't know if there will be a lip-synch problem.

Then there won't be the issue of R2 not knowing Yoda or trying to scrap with him in ESB. It will probably actually help the Ben-and-R2-not-recognizing-each-other-in-ANH continuity problem as well. Then it'll be easier to accept Ben just putting up a facade.