Index: lib/libpfctl/libpfctl.c
===================================================================
--- lib/libpfctl/libpfctl.c
+++ lib/libpfctl/libpfctl.c
@@ -188,7 +188,7 @@
 	status->running = nvlist_get_bool(nvl, "running");
 	status->since = nvlist_get_number(nvl, "since");
 	status->debug = nvlist_get_number(nvl, "debug");
-	status->hostid = nvlist_get_number(nvl, "hostid");
+	status->hostid = ntohl(nvlist_get_number(nvl, "hostid"));
 	status->states = nvlist_get_number(nvl, "states");
 	status->src_nodes = nvlist_get_number(nvl, "src_nodes");
 
@@ -815,7 +815,7 @@
 	ps->packets[1] = s->packets[1];
 	ps->bytes[0] = s->bytes[0];
 	ps->bytes[1] = s->bytes[1];
-	ps->creatorid = s->creatorid;
+	ps->creatorid = ntohl(s->creatorid);
 	ps->key[0].proto = s->proto;
 	ps->key[1].proto = s->proto;
 	ps->key[0].af = s->af;
Index: sbin/pfctl/pfctl_parser.c
===================================================================
--- sbin/pfctl/pfctl_parser.c
+++ sbin/pfctl/pfctl_parser.c
@@ -541,7 +541,7 @@
 	}
 
 	if (opts & PF_OPT_VERBOSE) {
-		printf("Hostid:   0x%08x\n", ntohl(s->hostid));
+		printf("Hostid:   0x%08x\n", s->hostid);
 
 		for (i = 0; i < PF_MD5_DIGEST_LENGTH; i++) {
 			buf[i + i] = hex[s->pf_chksum[i] >> 4];
Index: sys/netinet/ip_mroute.c
===================================================================
--- sys/netinet/ip_mroute.c
+++ sys/netinet/ip_mroute.c
@@ -741,8 +741,13 @@
     vifi_t vifi;
     struct bw_upcall *bu;
 
-    if (V_ip_mrouter == NULL)
-	return EINVAL;
+    if (V_ip_mrouter == NULL) {
+        if (locked) {
+            struct epoch_tracker *mrouter_et = locked;
+            MROUTER_RUNLOCK_PARAM(mrouter_et);
+        }
+        return (EINVAL);
+    }
 
     /*
      * Detach/disable hooks to the reset of the system.
Index: sys/netinet/raw_ip.c
===================================================================
--- sys/netinet/raw_ip.c
+++ sys/netinet/raw_ip.c
@@ -887,9 +887,10 @@
 	    ("rip_detach: not closed"));
 
 	/* Disable mrouter first, lock released inside ip_mrouter_done */
-	MROUTER_RLOCK();
-	if (so == V_ip_mrouter && ip_mrouter_done)
+	if (so == V_ip_mrouter && ip_mrouter_done) {
+		MROUTER_RLOCK();
 		ip_mrouter_done(MROUTER_RLOCK_PARAM_PTR);
+	}
 
 	INP_WLOCK(inp);
 	INP_HASH_WLOCK(&V_ripcbinfo);