More updates for python 3