Misc fixes to Vex