More python3 fixes.