Fix a few more things found in review

2020-05-07, Gary Kramlich