diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -1046,6 +1046,7 @@
 	sbuf_set_drain(&sb, sbuf_printf_drain, NULL);
 	xpt_announce_periph_sbuf(periph, &sb, announce_string);
 	(void)sbuf_finish(&sb);
+	(void)sbuf_delete(&sb);
 }
 
 void
@@ -1122,6 +1123,7 @@
 	sbuf_set_drain(&sb, sbuf_printf_drain, NULL);
 	xpt_denounce_periph_sbuf(periph, &sb);
 	(void)sbuf_finish(&sb);
+	(void)sbuf_delete(&sb);
 }
 
 void
@@ -5547,7 +5549,7 @@
 {
 	struct sbuf sbuf;
 	char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */
-	struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN);
+	struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL);
 	va_list ap;
 
 	sbuf_set_drain(sb, sbuf_printf_drain, NULL);
@@ -5566,7 +5568,7 @@
 {
 	struct sbuf sbuf;
 	char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */
-	struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN);
+	struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL);
 	va_list ap;
 
 	sbuf_set_drain(sb, sbuf_printf_drain, NULL);
@@ -5585,7 +5587,7 @@
 {
 	struct sbuf sbuf;
 	char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */
-	struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN);
+	struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL);
 	va_list ap;
 
 	sbuf_set_drain(sb, sbuf_printf_drain, NULL);
diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c
--- a/sys/dev/nvmf/controller/nvmft_controller.c
+++ b/sys/dev/nvmf/controller/nvmft_controller.c
@@ -31,7 +31,7 @@
 	va_list ap;
 	size_t retval;
 
-	sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN);
+	sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL);
 	sbuf_set_drain(&sb, sbuf_printf_drain, &retval);
 
 	sbuf_printf(&sb, "nvmft%u: ", ctrlr->cntlid);