Python 2.6 Support

Some modifications for Python 2.6 support