Improving Stability in Choppy Water