Further updates for 3.1 compatibility.