Fix python3 issues