Merge pull request #1227 from cdavis5e/xcode-11-fixes

Fix build on Xcode 11.