2to3 updates
Small improvements