Residual stress management