xwordfan,
I have just started solving this.
I think a letter has to be added to some clues and it has to be removed from some answers.
16a is one where you have to add the letter to solve the clue.
20A is 8,6 but a letter is dropped before entering.
I have not yet solved the two you mention.