Python3.3 fixes