diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index bf57517a188e530f5d905c0c58b8075d8982b6f7..4858e711c040b26182f6d5ed3f0f2b5df9f6356f 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -162,10 +162,10 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo,
     nodeinfo->cores = 1;
 
     nodeinfo->nodes = 1;
-#if HAVE_NUMACTL
+# if HAVE_NUMACTL
     if (numa_available() >= 0)
         nodeinfo->nodes = numa_max_node() + 1;
-#endif
+# endif
 
     /* NB: It is impossible to fill our nodes, since cpuinfo
      * has no knowledge of NUMA nodes */
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 8d5c8bbe71cacf0df01344c3a77c093cf8877330..153582d1616062ba72b463c7b6a4edda03d7d08c 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1716,11 +1716,11 @@ write_func(void *ptr, size_t size, size_t nmemb, void *comms_)
 {
     xen_comms *comms = comms_;
     size_t n = size * nmemb;
-    #ifdef PRINT_XML
-        printf("\n\n---Result from server -----------------------\n");
-        printf("%s\n",((char*) ptr));
-        fflush(stdout);
-    #endif
+#ifdef PRINT_XML
+    printf("\n\n---Result from server -----------------------\n");
+    printf("%s\n",((char*) ptr));
+    fflush(stdout);
+#endif
     return (size_t) (comms->func(ptr, n, comms->handle) ? n : 0);
 }
 
@@ -1734,12 +1734,11 @@ call_func(const void *data, size_t len, void *user_handle,
 {
     //(void)user_handle;
     struct _xenapiPrivate *priv = (struct _xenapiPrivate *)user_handle;
-    #ifdef PRINT_XML
-
-        printf("\n\n---Data to server: -----------------------\n");
-        printf("%s\n",((char*) data));
-        fflush(stdout);
-    #endif
+#ifdef PRINT_XML
+    printf("\n\n---Data to server: -----------------------\n");
+    printf("%s\n",((char*) data));
+    fflush(stdout);
+#endif
     CURL *curl = curl_easy_init();
     if (!curl) {
       return -1;
@@ -1750,9 +1749,9 @@ call_func(const void *data, size_t len, void *user_handle,
     };
     curl_easy_setopt(curl, CURLOPT_URL, priv->url);
     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-    #ifdef CURLOPT_MUTE
-        curl_easy_setopt(curl, CURLOPT_MUTE, 1);
-    #endif
+#ifdef CURLOPT_MUTE
+    curl_easy_setopt(curl, CURLOPT_MUTE, 1);
+#endif
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_func);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &comms);
     curl_easy_setopt(curl, CURLOPT_POST, 1);
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 4b9a6d85c4a4da823fe689e95dd903261f4becb6..59edbf3188aab53fdb2dae43f094992de8c8eab5 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -548,7 +548,7 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def,
                 char macStr[VIR_MAC_STRING_BUFLEN];
                 virFormatMacAddr(def->nets[i]->mac, macStr);
                 if (!(mac = strdup(macStr))) {
-                    if (bridge) VIR_FREE(bridge);
+                    VIR_FREE(bridge);
                     goto error_cleanup;
                 }
             }
@@ -559,7 +559,7 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def,
                 VIR_FREE(bridge);
                 device_number++;
             }
-            if (bridge) VIR_FREE(bridge);
+            VIR_FREE(bridge);
         }
     }
     return 0;