More Python 3 to 2 changes...