More changes to get 3.9 working.