Misc fixes for HLT and development

Misc fixes for HLT and development