hig3: minor fixes