Fixes #5418 - also a bunch of small shuttle fixes

Fixes #5418