More fixes!

Fixes the shuttle's problems.