Fixes to subtitles and player selection