2to3 tool corrections