Fix some issues found in review

2020-01-31, Gary Kramlich