Fix Xcode 6.1 compile issues