diff --git a/Shorewall/compiler b/Shorewall/compiler
index 7bddfdc54..791577bc8 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -998,12 +998,6 @@ setup_tc() {
 #
 delete_tc()
 {
-    clear_one_tc() {
-	save_command "tc qdisc del dev $1 root 2> /dev/null"
-	save_command "tc qdisc del dev $1 ingress 2> /dev/null"
-
-    }
-
     save_progress_message "Clearing Traffic Control/QOS"
 
     append_file tcclear
diff --git a/Shorewall/lib.base b/Shorewall/lib.base
index 3d73ed302..e3fed4460 100644
--- a/Shorewall/lib.base
+++ b/Shorewall/lib.base
@@ -339,6 +339,11 @@ lib_load() # $1 = Name of the Library, $2 = Error Message heading if the library
     eval loaded=\$LIB_${1}_LOADED
 
     if [ -z "$loaded" ]; then
+	if [ -n "$EXPERIMENTAL" ]; then
+	    eval LIB_${1}_LOADED=Yes
+	    return
+	fi
+
 	if [ -f $lib ]; then
 	    progress_message "Loading library $lib..."
 	    . $lib
@@ -1228,6 +1233,16 @@ disable_ipv6() {
     fi
 }
 
+# Function to truncate a string -- It uses 'cut -b -<n>'
+# rather than ${v:first:last} because light-weight shells like ash and
+# dash do not support that form of expansion.
+#
+
+truncate() # $1 = length
+{
+    cut -b -${1}
+}
+
 #
 # Add a logging rule.
 #
diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index 3278c2a70..602023e84 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -128,16 +128,6 @@ is_policy_chain() # $1 = name of chain
     eval test \"\$${1}_is_policy\" = Yes
 }
 
-# Function to truncate a string -- It uses 'cut -b -<n>'
-# rather than ${v:first:last} because light-weight shells like ash and
-# dash do not support that form of expansion.
-#
-
-truncate() # $1 = length
-{
-    cut -b -${1}
-}
-
 #
 # Return a space separated list of values matching
 #
@@ -2179,6 +2169,7 @@ do_initialize() {
 	    report_capabilities1 > $TMP_DIR/capabilities
 	    export TMP_DIR
 	    export CONFIG_PATH
+	    export VERSION
 	fi
     fi
     #