Cargo bay and fairing fixes; some more wing interaction tweaks