vendor upgrade plus some fixes