Further python 3 compatibility.