Vendor User and general fixes.