Fix compiler errors with Xcode 6.1