Updates for Python 3 compatibility.