Mostly fixes to imports after shipping code from 3.10