Updates for python3