Python 2.6 fixes, thanks to superkuh