Review fixes

Review fixes from
https://www.w3.org/2002/09/wbs/35422/techunderstandpublic/results