Python 3 fixes part III