diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index e695f6b01..d4c45c949 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -58,6 +58,6 @@ function __bower_list_installed
 end
 
 complete -c bower -n "__fish_is_first_token" -x -a '(__bower_cmds)'
-complete -c bower -n "__fish_should_complete_args" -x -a '(__bower_args)'
+complete -c bower -n "__fish_should_complete_switches" -x -a '(__bower_args)'
 complete -c bower -n "__fish_seen_subcommand_from install" -x -a '(__bower_matching_pkgs)'
 complete -c bower -n "__fish_seen_subcommand_from uninstall" -x -a '(__bower_list_installed)'
diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index e1732f61a..1564ad644 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -39,7 +39,7 @@ function __yarn_installed_packages
     end
 
     if type -q jq
-        jq -r '.dependencies | to_entries[] | .key' bower.json
+        jq -r '.dependencies | to_entries[] | .key' $package_json
     else
         set -l depsFound 0
         for line in (cat $package_json)