diff --git a/lib/ifdown-bond b/lib/ifdown-bond
index 1d81ecb..80a2cf2 100755
--- a/lib/ifdown-bond
+++ b/lib/ifdown-bond
@@ -38,7 +38,7 @@ setup_ip_param
 LC_ALL=C ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
 
 # release slave devices
-for SLAVE_DEV in $(cat /sys/class/net/${DEVICE}/bonding/slaves); do
+for SLAVE_DEV in $(cat /sys/class/net/${DEVICE}/bonding/slaves 2>/dev/null); do
 	echo "-${SLAVE_DEV}" > /sys/class/net/${DEVICE}/bonding/slaves
 done
 
diff --git a/rc.d/init.d/cryptsetup b/rc.d/init.d/cryptsetup
index 0e7f272..e2ff60e 100755
--- a/rc.d/init.d/cryptsetup
+++ b/rc.d/init.d/cryptsetup
@@ -95,6 +95,10 @@ init_crypto() {
 			continue
 		fi
 
+		if echo "$src" | grep -q -E "^UUID=" ; then
+			src="/dev/disk/by-uuid/${src##UUID=}"
+		fi
+
 		if [ ! -b "$src"  ]; then
 			nls "$src: No such device"
 			ret=1
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 5e8cd20..b44e291 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -168,7 +168,7 @@ find_boot_interfaces() {
 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
 				[ "${DEVICE:+set}" != "set" ] && continue
 				[ ${USERS:-no} != no ] && continue
-				is_yes [ ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
+				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
 			done
 		`
 
diff --git a/sysconfig/system b/sysconfig/system
index a196f21..a4f125d 100644
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -13,7 +13,6 @@ FASTRC=no
 CONSOLE_LOGLEVEL=1
 
 # On errors (when system is starting) run sulogin instead of shell ?
-# This option disables debuginitrd=sh in geninitrd as well.
 RUN_SULOGIN_ON_ERR=yes
 
 # Default run nice level for all services if $SERVICE_RUN_NICE_LEVEL is not
diff --git a/lib/functions.network b/lib/functions.network
index d151b04..862d42b 100644
--- a/lib/functions.network
+++ b/lib/functions.network
@@ -484,7 +484,7 @@ setup_ip_rules ()
 				/sbin/ip rule add $args $prio
 			done
 		elif is_no "$1"; then
-			LC_ALL=C /sbin/ip rule show | grep -vE -e "from all lookup (main|default|local|253|254|255) \$" -e " map-to " | while read prio from src args; do
+			LC_ALL=C /sbin/ip rule show | grep -vE -e "from all lookup (main|default|local|253|254|255)[[:space:]]*\$" -e " map-to " | while read prio from src args; do
 				[ "$src" = "all" ] && /sbin/ip rule delete $args || /sbin/ip rule delete $from $src $args
 			done
 		fi
@@ -503,7 +503,7 @@ setup_ip_rules ()
 				/sbin/ip -6 rule add $args $prio
 			done
 		elif is_no "$1"; then
-			LC_ALL=C /sbin/ip -6 rule show | grep -vE -e "from all lookup (main|default|local|253|254|255) \$" -e " map-to " | while read prio from src args; do
+			LC_ALL=C /sbin/ip -6 rule show | grep -vE -e "from all lookup (main|default|local|253|254|255)[[:space:]]*\$" -e " map-to " | while read prio from src args; do
 				[ "$src" = "all" ] && /sbin/ip -6 rule delete $args || /sbin/ip -6 rule delete $from $src $args
 			done
 		fi