Python 3 re-fixes

fix the python2 fixes...