Fix Python 3 issues