Updates for python 3.x compatibility