TVDB fixes, near final