fixes needed for track/strip ordering issues