make build pass on Xcode 6.1.1