diff --git a/ChangeLog b/ChangeLog
index 2b2eab66e5..5b1240068c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct  8 15:42:44 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/cgroup.c: use safewrite()
+	* src/qemu_driver.c: missing VIR_FREE pojnted out by Eduardo Habkost
+
 Tue Oct  7 23:08:51 CEST 2008 Jim Meyering <meyering@redhat.com>
 
 	avoid "make syntax-check" failure
diff --git a/src/cgroup.c b/src/cgroup.c
index ed206dc643..f1801c89ce 100644
--- a/src/cgroup.c
+++ b/src/cgroup.c
@@ -649,7 +649,7 @@ int virCgroupAddTask(virCgroupPtr group, pid_t pid)
             goto done;
         }
 
-        if (safe_write(fd, pidstr, strlen(pidstr)) <= 0) {
+        if (safewrite(fd, pidstr, strlen(pidstr)) <= 0) {
             rc = -errno;
             goto done;
         }
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 806608d782..a88cb75618 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -2176,6 +2176,7 @@ static int qemudDomainShutdown(virDomainPtr dom) {
                          "%s", _("shutdown operation failed"));
         return -1;
     }
+    VIR_FREE(info);
     return 0;
 
 }