Fixes to gunship

...ion!)