small improvements for p5-CHI and dependences