Last minute fixes to deal with testing vendor identifier