More small Python3 fixes