21.2, fix a couple of bugs in language use