a few more python3 fixes