Merge pull request #1065 from cdavis5e/tvos-fixes

Really fix tvOS build.