Bugfixes again for HLT.

No match.