diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish
index fe97321..5e931a4 100644
--- a/conf.d/forgit.plugin.fish
+++ b/conf.d/forgit.plugin.fish
@@ -7,14 +7,14 @@ if [ ! -e "$FORGIT" ]
 end
 
 function forgit::warn
-    printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$argv" >&2;
+    printf "%b[Warn]%b %s\n" '\e[0;33m' '\e[0m' "$argv" >&2
 end
 
 # backwards compatibility:
 # export all user-defined FORGIT variables to make them available in git-forgit
 set unexported_vars 0
 set | awk -F ' ' '{ print $1 }' | grep FORGIT_ | while read var
-    if ! set -x | grep -q "^$var "
+    if not set -x | grep -q "^$var\b"
         if test $unexported_vars = 0
             forgit::warn "Config options have to be exported in future versions of forgit."
             forgit::warn "Please update your config accordingly:"