Fixed vendor issues For UAT