Python 3.2 fixes