Fix upgrade waves.