Update for D10 compatibility.