More Python 3 fixes