Py32/Py33 fixes