More stability fixes for Xcode 6