Fix bugs with vendor