Fixes for Xcode Beta 7