Further changes for ZFS