more py3.2 fixes