Even more python3 fixes.