Fix compile errors on Xcode 6.1