More updates for Python 3