Release fixups, word choice, refs, etc.
Land #3472, releae fixes