Some fixes to tv stuff