fix issues for Python 2.x