Fixes to make TV display work
Finished TV fix