More fixes for sub-keyframe support