Fix a few things found in review

2020-06-29, Gary Kramlich