Small fix-ups for Python 3