Minor import fixes (rebased onto dev_4_4)

See gh-777 for testing details.  Mainly this is needed to finish the .czi fixes for gh-814.