diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 20b5bd4ccafd385793e94f24d1f3087ca1be49c6..9adb6b05fe6486b251f2fb8f30c360d540043be8 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -66,7 +66,6 @@
  * */
 
 static unsigned const int HMC = 0;
-static unsigned const int IVM = 127;
 static unsigned const int PHYP_IFACENAME_SIZE = 24;
 static unsigned const int PHYP_MAC_SIZE = 12;
 
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index b38e5301e643f1022816db1057a12f1947d40953..1841816db50255db6ddcf6df22ac017cacc60817 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -1,7 +1,7 @@
 /*
  * storage_backend_scsi.c: storage backend for SCSI handling
  *
- * Copyright (C) 2007-2008, 2013 Red Hat, Inc.
+ * Copyright (C) 2007-2008, 2013-2014 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -100,37 +100,6 @@ out:
     return retval;
 }
 
-struct diskType {
-    int part_table_type;
-    unsigned short offset;
-    unsigned short length;
-    unsigned long long magic;
-};
-
-static struct diskType const disk_types[] = {
-    { VIR_STORAGE_POOL_DISK_LVM2, 0x218, 8, 0x31303020324D564CULL },
-    { VIR_STORAGE_POOL_DISK_GPT,  0x200, 8, 0x5452415020494645ULL },
-    { VIR_STORAGE_POOL_DISK_DVH,  0x0,   4, 0x41A9E50BULL },
-    { VIR_STORAGE_POOL_DISK_MAC,  0x0,   2, 0x5245ULL },
-    { VIR_STORAGE_POOL_DISK_BSD,  0x40,  4, 0x82564557ULL },
-    { VIR_STORAGE_POOL_DISK_SUN,  0x1fc, 2, 0xBEDAULL },
-    /*
-     * NOTE: pc98 is funky; the actual signature is 0x55AA (just like dos), so
-     * we can't use that.  At the moment I'm relying on the "dummy" IPL
-     * bootloader data that comes from parted.  Luckily, the chances of running
-     * into a pc98 machine running libvirt are approximately nil.
-     */
-    /*{ 0x1fe, 2, 0xAA55UL },*/
-    { VIR_STORAGE_POOL_DISK_PC98, 0x0,   8, 0x314C5049000000CBULL },
-    /*
-     * NOTE: the order is important here; some other disk types (like GPT and
-     * and PC98) also have 0x55AA at this offset.  For that reason, the DOS
-     * one must be the last one.
-     */
-    { VIR_STORAGE_POOL_DISK_DOS,  0x1fe, 2, 0xAA55ULL },
-    { -1,                         0x0,   0, 0x0ULL },
-};
-
 static int
 virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target,
                                          unsigned long long *allocation,
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index a0cbbfe2182b595e3f2d6f61e2ce206d4b0dbd2d..a6232b70acab26c9d68d496e3d32555fc39498c4 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -1281,7 +1281,7 @@ int virDBusIsServiceEnabled(const char *name)
                           "/org/freedesktop/DBus",
                           "org.freedesktop.DBus",
                           "ListActivatableNames",
-                          DBUS_TYPE_INVALID) < 0)
+                          NULL) < 0)
         return ret;
 
     if (!dbus_message_iter_init(reply, &iter) ||