Minor performance fixes (mostly subtitle loading)