minor bug fixes, removing compile warnings
Authored by: aweatherguy 2017-09-11
Parent: [r652]
Child: [r654]