ZFS/GFS handling fixes

.zfs handling issues fixed