Merge pull request #1257 from ianpartridge/api-fixup-4.0

[4.0] Darwin API compatibility fixes