Add support for non-mounted ZFS and fix for Solaris.