More subtitle fixes