More python-2.6 compatibility fixes