Corrections for the Python 3.3 migration