more python3 fixes