Additional fixes for subtitles to work