More fixes to choppy video