Latest TV and Live TV Fixes from Master #54

Closed MarkBarbieri closed 4 years ago