Fixed ZFS support