Correct some Python 2.7 incompatibilities