More Python 3 fixes still.