Improved handling of .zip imports.