Add xcode6 compatibility.