Python 3.x compatibility fixes.