Fix things for Python 3