Minor fixes
Merge pull request #1369 from migree/htuEdits

Minor fixes