Add more fixes to Python 2.6 and 3.x.