Better support for Python 3