Fix an NRE and some wing interaction stuff