Fixes for Xcode 6.0(.1)