Fixing some Python 3.x issues with last commit.