diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index 2d9c40b74..4f4a1947b 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -23,7 +23,7 @@ complete -c ssh -s a --description "Disables forwarding of the authentication ag
 complete -c ssh -s A --description "Enables forwarding of the authentication agent"
 complete -x -c ssh -s b --description "Interface to transmit from" -a "
 (
-	tail -n +2 /proc/net/arp | cut -d ' ' -f 1 ^/dev/null
+	cut -d ' ' -f 1 /proc/net/arp ^/dev/null | string match -r -v '^IP'
 )
 "
 
diff --git a/share/functions/__fish_print_function_prototypes.fish b/share/functions/__fish_print_function_prototypes.fish
index a29ab5b10..d50c43d6d 100644
--- a/share/functions/__fish_print_function_prototypes.fish
+++ b/share/functions/__fish_print_function_prototypes.fish
@@ -1,5 +1,8 @@
 
 function __fish_print_function_prototypes -d "Prints the names of all function prototypes found in the headers in the current directory"
-    sed -n "s/^\(.*[^[a-zA-Z_0-9]\|\)\([a-zA-Z_][a-zA-Z_0-9]*\) *(.*);.*\$/\2/p" *.h*
+    set -l headers *.h *.hh *.hpp *.hxx
+    if set -q headers[1]
+        sed -n "s/^\(.*[^[a-zA-Z_0-9]\|\)\([a-zA-Z_][a-zA-Z_0-9]*\) *(.*);.*\$/\2/p" $headers
+    end
 end