Merge pull request #934 from tmm1/tvos-fixups

tvOS fixups