more hl fixes