Fixing python3 issues