some fixes and vendor update