diff --git a/src/util/virutil.c b/src/util/virutil.c
index 1116fda01b..c178515908 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1549,8 +1549,8 @@ virValidateWWN(const char *wwn)
     }
 
     if (i != 16 || p[i]) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Malformed wwn: %s"));
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Malformed wwn: %s"), wwn);
         return false;
     }
 
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 13a904fbd5..8e743f1415 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -3228,7 +3228,7 @@ static const vshCmdOptDef opts_dom_pm_suspend[] = {
      .help = N_("duration in seconds")
     },
     {.name = "target",
-     .type = VSH_OT_STRING,
+     .type = VSH_OT_DATA,
      .flags = VSH_OFLAG_REQ,
      .help = N_("mem(Suspend-to-RAM), "
                 "disk(Suspend-to-Disk), "
@@ -4268,7 +4268,7 @@ static const vshCmdOptDef opts_save_image_define[] = {
      .help = N_("saved state file to modify")
     },
     {.name = "xml",
-     .type = VSH_OT_STRING,
+     .type = VSH_OT_DATA,
      .flags = VSH_OFLAG_REQ,
      .help = N_("filename containing updated XML for the target")
     },
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 4a3ff2846d..28b160d69b 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -497,7 +497,7 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd)
     pageSizes[0] = VIR_DIV_UP(tmp, 1024);
 
     if (vshCommandOptULongLong(cmd, "pagecount", &pageCounts[0]) < 0) {
-        vshError(ctl, "%s", _("pagecount hat to be a number"));
+        vshError(ctl, "%s", _("pagecount has to be a number"));
         return false;
     }