Fix some issues found in review

2020-06-10, Gary Kramlich