Fix up after 3.10 imports