Improved python 3 compatibility.