Fix some issues that are found in review

2019-08-29, Gary Kramlich