Bug fixes for python 2.6