diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
index 39dd841..e355b4c 100755
--- a/scripts/dbginfo.sh
+++ b/scripts/dbginfo.sh
@@ -106,7 +106,7 @@ if test -z "${paramWORKDIR_BASE}"; then
     exit 1
 fi
 if test ! -d "${paramWORKDIR_BASE}"; then
-    echo "${SCRIPTNAME}: Error: The specified directory \"${paramWORKDIR_BASE}\" does ont exist!"
+    echo "${SCRIPTNAME}: Error: The specified directory \"${paramWORKDIR_BASE}\" does not exist!"
     echo
     exit 1
 fi
@@ -332,6 +332,7 @@ CONFIGFILES="\
   /etc/modprobe.d\
   /etc/mtab\
   /etc/multipath\
+  /etc/network\
   /etc/networks\
   /etc/pam.d\
   /etc/profile\
@@ -501,8 +502,9 @@ VM_CMDS="q userid\
 ########################################
 collect_cmdsout() {
     local cmd
-    local ifs_orig="${IFS}"
+    local ifs_orig
 
+    ifs_orig="${IFS}"
     pr_syslog_stdout "1 of ${COLLECTION_COUNT}: Collecting command output"
 
     IFS=:
@@ -521,8 +523,13 @@ collect_vmcmdsout() {
     local cp_command
     local vm_cmds
     local vm_userid
-    local module_loaded=1
-    local ifs_orig="${IFS}"
+    local module_loaded
+    local ifs_orig
+    local cp_buffer_size
+    local rc_buffer_size
+
+    module_loaded=1
+    ifs_orig="${IFS}"
 
     if echo "${RUNTIME_ENVIRONMENT}" | grep -qi "z/VM" >/dev/null 2>&1; then
 	pr_syslog_stdout "2 of ${COLLECTION_COUNT}: Collecting z/VM command output"
@@ -551,8 +558,8 @@ collect_vmcmdsout() {
 	IFS=:
 	for vm_command in ${vm_cmds}; do
 	    IFS="${ifs_orig}"
-	    local cp_buffer_size=2
-	    local rc_buffer_size=2
+	    cp_buffer_size=2
+	    rc_buffer_size=2
 	    while test ${rc_buffer_size} -eq 2 && test ${cp_buffer_size} -lt 1024; do
 		cp_buffer_size=$(( cp_buffer_size * 2 ))
 
@@ -593,10 +600,11 @@ collect_procfs() {
 
 ########################################
 collect_sysfs() {
-    local debugfs_mounted=0
+    local debugfs_mounted
     local dir_name
     local file_name
 
+    debugfs_mounted=0
     # Requires kernel version newer then 2.4
     if test "${LINUX_SUPPORT_SYSFS}" -eq 0; then
 	pr_syslog_stdout "4 of ${COLLECTION_COUNT}: Collecting sysfs"
@@ -668,9 +676,11 @@ collect_configfiles() {
 
 ########################################
 collect_osaoat() {
-    local network_devices=$(lsqeth 2>/dev/null | grep "Device name" | sed 's/.*:[[:space:]]\+\([^[:space:]]*\)[[:space:]]\+/\1/g')
+    local network_devices
     local network_device
 
+    network_devices=$(lsqeth 2>/dev/null | grep "Device name" \
+                     | sed 's/.*:[[:space:]]\+\([^[:space:]]*\)[[:space:]]\+/\1/g')
     if which qethqoat >/dev/null 2>&1; then
 	if test -n "${network_devices}"; then
 	    pr_syslog_stdout "7 of ${COLLECTION_COUNT}: Collecting osa oat output"
@@ -691,25 +701,27 @@ collect_osaoat() {
 ########################################
 # OpenVSwitch
 collect_ovs() {
-    local br_list=$(ovs-vsctl list-br)
+    local br_list
     local ovscmd
     local bridge
     local ovsbrcmd
-    local OVSCMDS="ovs-dpctl -s show\
-                  :ovs-vsctl -t 5 show\
-                  :ovsdb-client dump\
-                  "
+    local ovscmds
     local ovsbrcmds
 
+    br_list=$(ovs-vsctl list-br)
+    ovscmds="ovs-dpctl -s show\
+            :ovs-vsctl -t 5 show\
+            :ovsdb-client dump\
+            "
     if test -n "${br_list}"; then
         pr_syslog_stdout "8 of ${COLLECTION_COUNT}: Collecting OpenVSwitch output"
         IFS=:
-          for ovscmd in ${OVSCMDS}; do
+          for ovscmd in ${ovscmds}; do
             IFS=${ifs_orig} call_run_command "${ovscmd}" "${OUTPUT_FILE_OVS}.out"
           done
         IFS="${ifs_orig}"
 
-        while read -r bridge; do
+        for bridge in ${br_list}; do
         ovsbrcmds="ovs-ofctl show ${bridge}\
                     :ovs-ofctl dump-flows ${bridge}\
                     :ovs-appctl fdb/show ${bridge}\
@@ -719,7 +731,7 @@ collect_ovs() {
             IFS=${ifs_orig} call_run_command "${ovsbrcmd}" "${OUTPUT_FILE_OVS}.out"
           done
          IFS="${ifs_orig}"
-        done <<< "$br_list"
+        done
     else
         pr_syslog_stdout "8 of ${COLLECTION_COUNT}: Collecting OpenVSwitch output skipped"
     fi
@@ -729,12 +741,13 @@ collect_ovs() {
 
 ########################################
 collect_domain_xml() {
-    local domain_list=$(virsh list --all --name)
+    local domain_list
     local domain
 
+    domain_list=$(virsh list --all --name)
     if test -n "${domain_list}"; then
         pr_syslog_stdout "9 of ${COLLECTION_COUNT}: Collecting domain xml files"
-	  for domain in ${domain_list}; do 
+	  for domain in ${domain_list}; do
 	    call_run_command "virsh dumpxml ${domain}" "${OUTPUT_FILE_XML}_${domain}.xml"
           done
     else
@@ -807,9 +820,13 @@ post_processing() {
 # Be aware that this output must be
 # redirected into a separate logfile
 call_run_command() {
-    local cmd="${1}"
-    local logfile="${2}"
-    local raw_cmd=$(echo "${cmd}" | sed -ne 's/^\([^[:space:]]*\).*$/\1/p')
+    local cmd
+    local logfile
+    local raw_cmd
+
+    cmd="${1}"
+    logfile="${2}"
+    raw_cmd=$(echo "${cmd}" | sed -ne 's/^\([^[:space:]]*\).*$/\1/p')
 
     echo "#######################################################" >> "${logfile}"
     echo "${USER}@${SYSTEMHOSTNAME:-localhost}> ${cmd}" >> "${logfile}"
@@ -838,8 +855,9 @@ call_run_command() {
 ########################################
 call_collect_file() {
     local directory_name
-    local file_name="${1}"
+    local file_name
 
+    file_name="${1}"
     echo " ${file_name}"
 
     directory_name=$(dirname "${file_name}" 2>/dev/null)