Merge pull request #1063 from cdavis5e/tvos-fixes

Fix build errors on tvOS.