Small changes for superconvergence impl.