More python3 compatibility.