Various python 3.x compatibility fixes.