Vpcounter fixes and testing