diff --git a/lib/rt_names.c b/lib/rt_names.c
index 3a16d5cf..04c15ff5 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -119,7 +119,7 @@ static void rtnl_tab_initialize(const char *file, char **tab, int size)
 }
 
 static char *rtnl_rtprot_tab[256] = {
-	[RTPROT_UNSPEC]   = "none",
+	[RTPROT_UNSPEC]   = "unspec",
 	[RTPROT_REDIRECT] = "redirect",
 	[RTPROT_KERNEL]	  = "kernel",
 	[RTPROT_BOOT]	  = "boot",
diff --git a/tc/f_matchall.c b/tc/f_matchall.c
index 04e524e3..ac486308 100644
--- a/tc/f_matchall.c
+++ b/tc/f_matchall.c
@@ -130,6 +130,15 @@ static int matchall_print_opt(struct filter_util *qu, FILE *f,
 			sprint_tc_classid(rta_getattr_u32(tb[TCA_MATCHALL_CLASSID]), b1));
 	}
 
+	if (tb[TCA_MATCHALL_FLAGS]) {
+		__u32 flags = rta_getattr_u32(tb[TCA_MATCHALL_FLAGS]);
+
+		if (flags & TCA_CLS_FLAGS_SKIP_HW)
+			fprintf(f, "\n  skip_hw");
+		if (flags & TCA_CLS_FLAGS_SKIP_SW)
+			fprintf(f, "\n  skip_sw");
+	}
+
 	if (tb[TCA_MATCHALL_ACT])
 		tc_print_action(f, tb[TCA_MATCHALL_ACT]);
 
diff --git a/testsuite/Makefile b/testsuite/Makefile
index 50a7bafa..055136b5 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -17,8 +17,9 @@ ifneq (,$(wildcard /proc/config.gz))
 	KENV := $(shell cat /proc/config.gz | gunzip | grep ^CONFIG)
 else
 KVER := $(shell uname -r)
-KCPATH := /lib/modules/${KVER}/config
-ifneq (,$(wildcard ${KCPATH}))
+KCPATHS := /lib/modules/$(KVER)/config /boot/config-$(KVER)
+KCPATH := $(firstword $(wildcard $(KCPATHS)))
+ifneq (,$(KCPATH))
 	KENV := $(shell cat ${KCPATH} | grep ^CONFIG)
 endif
 endif