diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index b9f5e9596..9d7b3a8a2 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -5,7 +5,7 @@ complete -c cargo -l list -d 'List installed commands'
 complete -c cargo -s v -l verbose -d 'Use verbose output'
 complete -c cargo -s q -l quiet -d 'No output printed to stdout'
 
-set -lx __fish_cargo_subcommands (cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s+(.*)' '$1\t$2' | string escape)
+set -l __fish_cargo_subcommands (cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s+(.*)' '$1\t$2' | string escape)
 
 complete -c cargo -f -c cargo -n __fish_use_subcommand -a "$__fish_cargo_subcommands"
 complete -c cargo -x -c cargo -n '__fish_seen_subcommand_from help' -a "$__fish_cargo_subcommands"
diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 927de7122..2deea83d8 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -10,7 +10,7 @@
 # - for the program command, complete the script to be executed
 # - for commands accepting several arguments of different types, propose arguments in the right order: for get, once the ZFS parameters have been given, only propose datasets
 
-set -lx OS ""
+set -l OS ""
 switch (uname)
     case Linux
         set OS Linux