S3 - mixin fixes for TV