Vox shuttle tweaks, some other things.

All of these things bar one are fixes, and I would rather not mess around with an extra dev branch this evening.