HSV fixes for cpt parser and cptinfo