Minor issues

Bock, Andy requested to merge Bock into master Sep 08, 2021