Minor fixes to v2.6 PID Parser