Fixed incompatibilities with older versions of Python 2.6.X