MPEG TS/PS fixes