Another python3 fixes