Updates for python 3