4 files changed, 7 insertions, 5 deletions
diff --git a/Completion/BSD/Command/_gstat b/Completion/BSD/Command/_gstat
index 7baaf0d62..c60e54422 100644
--- a/Completion/BSD/Command/_gstat
+++ b/Completion/BSD/Command/_gstat
@@ -2,10 +2,12 @@
 
 _arguments -s : \
   '-a[only display providers that are at least 0.1% busy]' \
-  '-b[batch mode]' \
+  '(-B)-b[batch mode]' \
+  '(-b)-B[endless batch mode]' \
   '-c[enable the display geom(4) consumers]' \
   '-d[enable the display delete operations]' \
   '-f+[filter by regex]:regex' \
   '-o[enable the display for other operations]' \
+  "-s[enable blocks' size statistics]" \
   '-I+[display refresh rate]:interval (ms)' \
   '-p[only display physical providers]'
diff --git a/Completion/BSD/Command/_kld b/Completion/BSD/Command/_kld
index 94528955c..42fdc2bd0 100644
--- a/Completion/BSD/Command/_kld
+++ b/Completion/BSD/Command/_kld
@@ -26,7 +26,7 @@ _kld() {
   case "$service" in
     kldload)
       _arguments -s -S -A "-*" \
-        "-n[don't try to load module if already loaded]"
+        "-n[don't try to load module if already loaded]" \
         '-v[be verbose]' \
         '-q[silence any extraneous warnings]' \
         '*:module to load:_kld_module'
diff --git a/Completion/BSD/Command/_portmaster b/Completion/BSD/Command/_portmaster
index 4c16e2d1b..48390c9ad 100644
--- a/Completion/BSD/Command/_portmaster
+++ b/Completion/BSD/Command/_portmaster
@@ -5,7 +5,7 @@ _portmaster_pkgs() {
 }
 
 _portmaster_ports() {
-  local ret=1 _fbsd_ports _fbsd_cat
+  local expl ret=1 _fbsd_ports _fbsd_cat
    _fbsd_cat=(${PORTSDIR:-/usr/ports}/[a-z]*(/:t))
    if [[ $PREFIX != */* ]] ; then
      _wanted cat_packages expl 'category/ports' compadd -S '/' $_fbsd_cat
diff --git a/Completion/BSD/Command/_sysrc b/Completion/BSD/Command/_sysrc
index 651c18b89..246d73bd3 100644
--- a/Completion/BSD/Command/_sysrc
+++ b/Completion/BSD/Command/_sysrc
@@ -76,9 +76,9 @@ _sysrc() {
 
       if (( $#rc_conf_vars )); then
         if [[ $opt == N ]]; then
-          _values -w -C variable ${^rc_conf_vars%%\[*}'::value' && ret=0
+          _values -w variable ${^rc_conf_vars%%\[*}'::value' && ret=0
         else
-          _values -w -C variable ${^rc_conf_vars}'::value' && ret=0
+          _values -w variable ${^rc_conf_vars}'::value' && ret=0
         fi
       fi
     fi