Fix py32 errors (hopefully got all of them)