more compatibility fixes for Python 2.6