Changes for new L1
Residual HLT fixes