Add some python3 fixes.