Add proprietary vendor and fix some stuffs in dependencies