Fixing contrib/vendor based on @mrunalp 's suggestions