Tidied up the Vox and Nuke Op shuttles a bit.
Fixed embedding.
Merge pull request #5429 from Zuhayr/dev

Shuttle fixes, embedding fix.