Couple of fixes for episodeview