S3 - mixin fixes for TV
Merge pull request #88 from abdulrauf/master

S3 - mixin fixes for TV