Fixes for Xcode6 / Beta 7