Import bugs

This PR fixes the import bugs noticed during the testing round for 4.4.6
https://trac.openmicroscopy.org.uk/ome/ticket/10322

https://trac.openmicroscopy.org.uk/ome/ticket/10334