diff --git a/AUTHORS b/AUTHORS
index 30ac0ef387284966155328d7d7997c5d66c90e41..41d81db20eb5634b8cd8d51c1dd895d4abb320d0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,7 +20,7 @@ The primary maintainers and people with commit access rights:
   Dave Leskovec        <dlesko@linux.vnet.ibm.com>
   Cole Robinson        <crobinso@redhat.com>
   Dan Smith            <danms@us.ibm.com>
-  Guido Guenther       <agx@sigxcpu.org>
+  Guido Günther        <agx@sigxcpu.org>
   John Levon           <john.levon@sun.com>
 
 Patches have also been contributed by:
@@ -64,3 +64,6 @@ Patches have also been contributed by:
 The libvirt Logo was designed by Diana Fong
 
 -- End
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/ChangeLog b/ChangeLog
index 49918dc84500c8042621af296822c4b591a57937..30b5228471f5325d4482fbb4419b02e59647aa42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jan  6 18:14:31 CET 2009 Guido Günther <agx@sigxcpu.org>
+
+	trivial cleanups
+	* src/qemu_driver.c (qemudGetMaxVCPUs): we have kvmGetMaxVCPUs(), so
+	  the comment can go
+	* src/qemu_driver.c (qemudDomainDetachDevice): fix error message
+	* AUTHORS: fix spelling and suggest UTF-8 encoding
+	* docs/apps.html.in: minor typo
+
 Tue Jan  6 18:12:38 CET 2009 Guido Günther <agx@sigxcpu.org>
 
 	* .gitignore: ignore generated TAGS files
diff --git a/docs/apps.html.in b/docs/apps.html.in
index 19736cb64713a2c16382d09fd4cddbf9284e8e7a..433627132870a4d097e52c73d2cdf980e66e3605 100644
--- a/docs/apps.html.in
+++ b/docs/apps.html.in
@@ -107,7 +107,7 @@
     <dl>
       <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt>
       <dd>
-	The plugins provided by Guido Günther allows to monitor various things
+	The plugins provided by Guido Günther allow to monitor various things
         like network and block I/O with
         <a href="http://munin.projects.linpro.no/">Munin</a>.
       </dd>
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 9a12b0b851bf927e038d00d0ba24bf84c2b95f49..b38ecd62a7d6167c3490f0f57edccb2a7ae9fa18 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1416,8 +1416,6 @@ static int qemudGetMaxVCPUs(virConnectPtr conn, const char *type) {
     if (STRCASEEQ(type, "qemu"))
         return 16;
 
-    /* XXX future KVM will support SMP. Need to probe
-       kernel to figure out KVM module version i guess */
     if (STRCASEEQ(type, "kvm"))
         return kvmGetMaxVCPUs();
 
@@ -3366,7 +3364,7 @@ static int qemudDomainDetachDevice(virDomainPtr dom,
     if (!virDomainIsActive(vm)) {
         qemuDriverUnlock(driver);
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
-                         "%s", _("cannot attach device on inactive domain"));
+                         "%s", _("cannot detach device on inactive domain"));
         goto cleanup;
     }