Xcode Beta 6 Fixes