Python 3.3 fixes