Few 2to3 fixes