Vortex fixes

Not working yet, but ready for a sync with master