Fix Python 3.x issues