Yet more python changes