fixes issues in Xcode 6 Beta 5