diff --git a/src/common/dbus.c b/src/common/dbus.c
index 1715a5088..553d7eff7 100644
--- a/src/common/dbus.c
+++ b/src/common/dbus.c
@@ -10,9 +10,8 @@ static bool loadLibSymbols(FFDBusLibrary* lib)
     FF_LIBRARY_LOAD(dbus, &instance.config.library.libDBus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_bus_get, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_new_method_call, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_append_args, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init_append, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_append_basic, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_arg_type, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_basic, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_recurse, false)
@@ -20,10 +19,6 @@ static bool loadLibSymbols(FFDBusLibrary* lib)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_next, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_unref, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_send_with_reply_and_block, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_flush, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_block, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_steal_reply, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_unref, false)
     dbus = NULL; // don't auto dlclose
     return true;
 }
@@ -60,7 +55,7 @@ bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
 {
     int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
 
-    if(argType == DBUS_TYPE_STRING)
+    if(argType == DBUS_TYPE_STRING || argType == DBUS_TYPE_OBJECT_PATH)
     {
         const char* value = NULL;
         dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
@@ -72,6 +67,14 @@ bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
         return true;
     }
 
+    if (argType == DBUS_TYPE_BYTE)
+    {
+        uint8_t value;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        ffStrbufAppendC(result, (char) value);
+        return false; // Don't append a comma
+    }
+
     if(argType != DBUS_TYPE_VARIANT && argType != DBUS_TYPE_ARRAY)
         return false;
 
@@ -93,7 +96,10 @@ bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
             ffStrbufAppendS(result, ", ");
         }
 
-        FF_DBUS_ITER_CONTINUE(dbus, &subIter);
+        if(!dbus->lib->ffdbus_message_iter_next(&subIter))
+            break;
+        else
+            continue;
     }
 
     if(foundAValue)
@@ -122,29 +128,27 @@ bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result)
     return ffDBusGetBool(dbus, &subIter, result);
 }
 
-bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result)
+bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint32_t* result)
 {
     int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
 
     if(argType == DBUS_TYPE_BYTE)
     {
-        dbus->lib->ffdbus_message_iter_get_basic(iter, result);
+        uint8_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
         return true;
     }
 
-    if(argType != DBUS_TYPE_VARIANT)
-        return false;
-
-    DBusMessageIter subIter;
-    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
-    return ffDBusGetByte(dbus, &subIter, result);
-}
-
-bool ffDBusGetUint16(FFDBusData* dbus, DBusMessageIter* iter, uint16_t* result)
-{
-    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
-
     if(argType == DBUS_TYPE_UINT16)
+    {
+        uint16_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if(argType == DBUS_TYPE_UINT32)
     {
         dbus->lib->ffdbus_message_iter_get_basic(iter, result);
         return true;
@@ -155,15 +159,18 @@ bool ffDBusGetUint16(FFDBusData* dbus, DBusMessageIter* iter, uint16_t* result)
 
     DBusMessageIter subIter;
     dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
-    return ffDBusGetUint16(dbus, &subIter, result);
+    return ffDBusGetUint(dbus, &subIter, result);
 }
 
-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method)
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg)
 {
     DBusMessage* message = dbus->lib->ffdbus_message_new_method_call(busName, objectPath, interface, method);
     if(message == NULL)
         return NULL;
 
+    if (arg)
+        dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
+
     DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
 
     dbus->lib->ffdbus_message_unref(message);
@@ -177,20 +184,10 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
     if(message == NULL)
         return NULL;
 
-    DBusMessageIter requestIterator;
-    dbus->lib->ffdbus_message_iter_init_append(message, &requestIterator);
-
-    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &interface))
-    {
-        dbus->lib->ffdbus_message_unref(message);
-        return NULL;
-    }
-
-    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &property))
-    {
-        dbus->lib->ffdbus_message_unref(message);
-        return NULL;
-    }
+    dbus->lib->ffdbus_message_append_args(message,
+        DBUS_TYPE_STRING, &interface,
+        DBUS_TYPE_STRING, &property,
+        DBUS_TYPE_INVALID);
 
     DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
 
@@ -219,4 +216,24 @@ bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char*
     return ret;
 }
 
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result)
+{
+    DBusMessage* reply = ffDBusGetProperty(dbus, busName, objectPath, interface, property);
+    if(reply == NULL)
+        return false;
+
+    DBusMessageIter rootIterator;
+    if(!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator))
+    {
+        dbus->lib->ffdbus_message_unref(reply);
+        return false;
+    }
+
+    bool ret = ffDBusGetUint(dbus, &rootIterator, result);
+
+    dbus->lib->ffdbus_message_unref(reply);
+
+    return ret;
+}
+
 #endif //FF_HAVE_DBUS
diff --git a/src/common/dbus.h b/src/common/dbus.h
index bf6a5cc98..876ef355c 100644
--- a/src/common/dbus.h
+++ b/src/common/dbus.h
@@ -7,22 +7,12 @@
 #include "common/library.h"
 
 #define FF_DBUS_TIMEOUT_MILLISECONDS 35
-
-#define FF_DBUS_ITER_CONTINUE(dbus, iterator) \
-    { \
-        if(!(dbus)->lib->ffdbus_message_iter_has_next(iterator)) \
-            break; \
-        (dbus)->lib->ffdbus_message_iter_next(iterator); \
-        continue; \
-    }
-
 typedef struct FFDBusLibrary
 {
     FF_LIBRARY_SYMBOL(dbus_bus_get)
     FF_LIBRARY_SYMBOL(dbus_message_new_method_call)
+    FF_LIBRARY_SYMBOL(dbus_message_append_args)
     FF_LIBRARY_SYMBOL(dbus_message_iter_init)
-    FF_LIBRARY_SYMBOL(dbus_message_iter_init_append)
-    FF_LIBRARY_SYMBOL(dbus_message_iter_append_basic)
     FF_LIBRARY_SYMBOL(dbus_message_iter_get_arg_type)
     FF_LIBRARY_SYMBOL(dbus_message_iter_get_basic)
     FF_LIBRARY_SYMBOL(dbus_message_iter_recurse)
@@ -30,10 +20,6 @@ typedef struct FFDBusLibrary
     FF_LIBRARY_SYMBOL(dbus_message_iter_next)
     FF_LIBRARY_SYMBOL(dbus_message_unref)
     FF_LIBRARY_SYMBOL(dbus_connection_send_with_reply_and_block)
-    FF_LIBRARY_SYMBOL(dbus_connection_flush)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_block)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_steal_reply)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_unref)
 } FFDBusLibrary;
 
 typedef struct FFDBusData
@@ -45,10 +31,10 @@ typedef struct FFDBusData
 const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); //Returns an error message or NULL on success
 bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
 bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result);
-bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result);
-bool ffDBusGetUint16(FFDBusData* dbus, DBusMessageIter* iter, uint16_t* result);
-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method);
+bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint32_t* result);
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg);
 DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property);
 bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result);
 
 #endif // FF_HAVE_DBUS