This PR fixes some typos and polishes trivial stuff.

Comment From: snicoll

Thanks @izeye. I've split the part that is specific to 2.3.x in a separate commit.