diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 8bdfbf1758..51f897cd9c 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1020,9 +1020,9 @@
       </dd>
       <dt><code>apic</code></dt>
       <dd>APIC allows the use of programmable IRQ
-      management. <span class="since">Since 0.10.2 (QEMU only)</span>
-      there is an optional attribute <code>eoi</code> with values "on"
-      and "off" which toggles the availability of EOI (End of
+      management. <span class="since">Since 0.10.2 (QEMU only)</span> there is
+      an optional attribute <code>eoi</code> with values <code>on</code>
+      and <code>off</code> which toggles the availability of EOI (End of
       Interrupt) for the guest.
       </dd>
       <dt><code>hap</code></dt>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b8ba0e2d0c..15b360a76b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8617,7 +8617,6 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
              virReportError(VIR_ERR_XML_ERROR,
                             _("Unsupported CPU placement mode '%s'"),
                             tmp);
-             VIR_FREE(tmp);
              goto error;
         }
         VIR_FREE(tmp);
@@ -8851,7 +8850,6 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
                         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                        _("unknown value for attribute eoi: %s"),
                                        tmp);
-                        VIR_FREE(tmp);
                         goto error;
                     }
                     def->apic_eoi = eoi;
@@ -13433,6 +13431,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
     }
 
     virBufferAddLit(buf, "  <os>\n");
+
     virBufferAddLit(buf, "    <type");
     if (def->os.arch)
         virBufferAsprintf(buf, " arch='%s'", def->os.arch);
@@ -13523,7 +13522,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
                                       " eoi='%s'",
                                       virDomainApicEoiTypeToString(def->apic_eoi));
                 }
-                virBufferAsprintf(buf, "/>\n");
+                virBufferAddLit(buf, "/>\n");
             }
         }
         virBufferAddLit(buf, "  </features>\n");