Fixed incompatabilities with python 2.6