Fix vex, import recent fixes from Carla