hl: small improvements