Tiny changes for 0.90.0 compatibility.