Supply shuttle fixes