fixing some stuff 2to3 didn't