Small fixes for 4.4.0 compatibility.