More changes to get to python3.