Import post demo fix

Few fixes post demo
 * https://trac.openmicroscopy.org.uk/ome/ticket/10980
 * https://trac.openmicroscopy.org.uk/ome/ticket/10982
 * https://trac.openmicroscopy.org.uk/ome/ticket/10977