diff --git a/ChangeLog b/ChangeLog
index 4310b5f348c5441390b178dcdbcd2c26a3747e98..f4b1c234a090fd67b4786a8a7435e48128441d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jul  4 10:14:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* src/conf.c, src/test.c, src/xen_internal.c: Readd checking
+	  of errors from virBuffer functions.
+	* src/sexpr.c: Add comment about use of _GNU_SOURCE.
+	* src/virsh.c: Remove use of _GNU_SOURCE / isblank.
+	* src/xml.c, tests/Makefile.am: Minor cleanup.
+
 Mon Jul  2 09:35:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/qemu_driver.c: Change 'qemu' to 'QEMU' to get compatability
diff --git a/src/conf.c b/src/conf.c
index 8f4fc64cc722e5297cfbdd1747f97adf49d57e78..3d4615a453564df55f0ac2c14d08279019c37a74 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -883,8 +883,10 @@ __virConfWriteFile(const char *filename, virConfPtr conf)
         return(-1);
 
     buf = virBufferNew(500);
-    if (buf == NULL)
+    if (buf == NULL) {
+        virConfError(NULL, VIR_ERR_NO_MEMORY, _("failed to allocate buffer"), 0);
         return(-1);
+    }
 
     cur = conf->entries;
     while (cur != NULL) {
@@ -935,8 +937,10 @@ __virConfWriteMem(char *memory, int *len, virConfPtr conf)
         return(-1);
 
     buf = virBufferNew(500);
-    if (buf == NULL)
+    if (buf == NULL) {
+        virConfError(NULL, VIR_ERR_NO_MEMORY, _("failed to allocate buffer"), 0);
         return(-1);
+    }
 
     cur = conf->entries;
     while (cur != NULL) {
diff --git a/src/sexpr.c b/src/sexpr.c
index 12599518cba3024b9b9b6414f0ba3bf05658bf5d..f88de95a45d1f272d102e404e6c51dad70d02367 100644
--- a/src/sexpr.c
+++ b/src/sexpr.c
@@ -10,7 +10,7 @@
  *  archive for more details.
  */
 
-#define _GNU_SOURCE
+#define _GNU_SOURCE /* for strndup */
 
 #include "sexpr.h"
 #include "internal.h"
diff --git a/src/test.c b/src/test.c
index 31a24ded1747f8a789eb9a16b27eee61ac66dd81..6e5723b7b3fb8dd18493b12a3972eb20a3ef7d05 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1389,6 +1389,7 @@ char * testDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED)
     con = &node->connections[priv->handle];
 
     if (!(buf = virBufferNew(4000))) {
+        testError(domain->conn, domain, VIR_ERR_NO_MEMORY, __FUNCTION__);
         return (NULL);
     }
 
diff --git a/src/virsh.c b/src/virsh.c
index 443e12dea15895bbd10108a8f169eaf24f91e5a0..7d05fdb8db83a5f72316f6c71ceb49d41a662a1e 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -13,8 +13,6 @@
  * $Id$
  */
 
-#define _GNU_SOURCE             /* isblank() */
-
 #include "libvirt/libvirt.h"
 #include "libvirt/virterror.h"
 #include <stdio.h>
@@ -3806,7 +3804,7 @@ vshCommandGetToken(vshControl * ctl, char *str, char **end, char **res)
 
     *end = NULL;
 
-    while (p && *p && isblank((unsigned char) *p))
+    while (p && *p && (*p == ' ' || *p == '\t'))
         p++;
 
     if (p == NULL || *p == '\0')
@@ -3817,7 +3815,7 @@ vshCommandGetToken(vshControl * ctl, char *str, char **end, char **res)
     }
     while (*p) {
         /* end of token is blank space or ';' */
-        if ((quote == FALSE && isblank((unsigned char) *p)) || *p == ';')
+        if ((quote == FALSE && (*p == ' ' || *p == '\t')) || *p == ';')
             break;
 
         /* end of option name could be '=' */
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 4221be356e7c6b17bc6e48cadc8d1f30578e2dbf..c410a0cc99586519f62c31b7da6f171f2c82c263 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -2138,7 +2138,10 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn ATTRIBUTE_UNUSED,
 
     /* Construct the final XML. */
     xml = virBufferNew (1024);
-    if (!xml) return NULL;
+    if (!xml) {
+        virXenError(VIR_ERR_NO_MEMORY, __FUNCTION__, 0);
+        return NULL;
+    }
     r = virBufferVSprintf (xml,
                            "\
 <capabilities>\n\
@@ -2225,15 +2228,13 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn ATTRIBUTE_UNUSED,
 </capabilities>\n", -1);
     if (r == -1) goto vir_buffer_failed;
     xml_str = strdup (xml->content);
-    if (!xml_str) {
-        virXenError(VIR_ERR_NO_MEMORY, "strdup", 0);
-        goto vir_buffer_failed;
-    }
+    if (!xml_str) goto vir_buffer_failed;
     virBufferFree (xml);
 
     return xml_str;
 
  vir_buffer_failed:
+    virXenError(VIR_ERR_NO_MEMORY, __FUNCTION__, 0);
     virBufferFree (xml);
     return NULL;
 }
diff --git a/src/xml.c b/src/xml.c
index 16e51499c4ca7a9a2c3c0237674df635cd8aca29..52c186788cd8491db7db0ab0facfd6678ba45104 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -267,10 +267,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt, xmlNodePtr **list) {
     xmlXPathFreeObject(obj);
     return(ret);
 }
-#endif /* !PROXY */
-
 
-#ifndef PROXY
 /**
  * virtDomainParseXMLGraphicsDescImage:
  * @conn: pointer to the hypervisor connection
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35c056c3c9adcd22481022cc976aeb2281918bae..f4f810c6514e6503fa939a6a70c31a9df033ba60 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,8 +46,8 @@ valgrind:
 xmlrpctest_SOURCES = \
 	xmlrpctest.c \
 	testutils.c testutils.h \
-	$(top_builddir)/src/xmlrpc.c \
-	$(top_builddir)/src/xmlrpc.h
+	@top_srcdir@/src/xmlrpc.c \
+	@top_srcdir@/src/xmlrpc.h
 
 xmlrpctest_LDFLAGS =
 xmlrpctest_LDADD = $(LDADDS)