Some more python3 fixes