Bug Fixes on Wing handling