ZFS/GFS handling fixes