Fixes for Xcode 6.2 Beta 2