Fix a few things that weren't Python 3 compatible

Installing on Python 3 requires a 2to3 pass as well,
these are just extra fixes that need to be run before
2to3.