Hl fixes
#428

awegsche wants to merge hl_fixes into master

We do not currently have an analysis of these two commits