Some fixes for Python 2.6