Fix some more python3 issues