Fix a few more things found in review

2020-06-30, Gary Kramlich