Further Fixes/Updates for 74X HLT

Further Fixes/Updates for 74X HLT

Includes/superseeds #6905 #6908 (those two PRs should thus be closed)