Import bugs

Import bugs fix in the PR
see https://trac.openmicroscopy.org.uk/ome/ticket/10996
https://trac.openmicroscopy.org.uk/ome/ticket/11025
https://trac.openmicroscopy.org.uk/ome/ticket/11001