More Python 3 fixes.
More pip fixes.