vde fixes and some compatibility with unpatched vde