Fixes for py3.2 support.