Fix more HH7 issues
Merge pull request #390 from avalonmediasystem/bugfix/VOV-3058

Fix more HH7 issues