Attempt to resolve build issues reported by nrezmerski under Xcode.