More py3 compatibility.