Cherry pick simplex fixes