Minor fixes - thank you SteveMCCommander.  Fixes #477.