Fixes for python 3.2