More minor ns fix, ch5