Fix up vendor setup to prepare for possible fork