Miscellaneous improvements from TiVo