More adaptions for 30 fps