Supports TV fixes

Supports TV fixesSupports TV fixes