diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 9dd29b39010c9cec80ea972275e92b9a7d2b041f..2838812422227ca0d5f9398afa65e6a705a75630 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -4229,6 +4229,30 @@ static int bpf_object__create_map(struct bpf_object *obj, struct bpf_map *map)
 			create_attr.inner_map_fd = map->inner_map_fd;
 	}
 
+	switch (def->type) {
+	case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
+	case BPF_MAP_TYPE_CGROUP_ARRAY:
+	case BPF_MAP_TYPE_STACK_TRACE:
+	case BPF_MAP_TYPE_ARRAY_OF_MAPS:
+	case BPF_MAP_TYPE_HASH_OF_MAPS:
+	case BPF_MAP_TYPE_DEVMAP:
+	case BPF_MAP_TYPE_DEVMAP_HASH:
+	case BPF_MAP_TYPE_CPUMAP:
+	case BPF_MAP_TYPE_XSKMAP:
+	case BPF_MAP_TYPE_SOCKMAP:
+	case BPF_MAP_TYPE_SOCKHASH:
+	case BPF_MAP_TYPE_QUEUE:
+	case BPF_MAP_TYPE_STACK:
+	case BPF_MAP_TYPE_RINGBUF:
+		create_attr.btf_fd = 0;
+		create_attr.btf_key_type_id = 0;
+		create_attr.btf_value_type_id = 0;
+		map->btf_key_type_id = 0;
+		map->btf_value_type_id = 0;
+	default:
+		break;
+	}
+
 	map->fd = bpf_create_map_xattr(&create_attr);
 	if (map->fd < 0 && (create_attr.btf_key_type_id ||
 			    create_attr.btf_value_type_id)) {
diff --git a/tools/netacc/net-acc b/tools/netacc/net-acc
index f3db4803ced3adeb477559c4a25e6c2351390227..f9b6159e9854f7de5892a4243d55fdedb01fcc95 100755
--- a/tools/netacc/net-acc
+++ b/tools/netacc/net-acc
@@ -27,7 +27,7 @@ if [[ "$CMD"X == "enableX" ]]; then
 	/usr/sbin/tuned_acc/redis_acc enable
 elif [[ "$CMD"X == "disableX" ]]; then
 	/usr/sbin/tuned_acc/redis_acc disable
-	rmmod localip
+	rmmod localip 2>/dev/null
 	exit 0
 else
 	usage;