Update to improved JaNXUtils