diff --git a/SVXLink/echolink/BrandMeisterBridge.cpp b/SVXLink/echolink/BrandMeisterBridge.cpp
index a433f1e..f4cc102 100644
--- a/SVXLink/echolink/BrandMeisterBridge.cpp
+++ b/SVXLink/echolink/BrandMeisterBridge.cpp
@@ -89,6 +89,7 @@ void BrandMeisterBridge::setTalker(const char* call, const char* name)
     size_t length = delimiter1 - call;
     char* buffer = (char*)alloca(length + sizeof(uint32_t));
     strncpy(buffer, call, length);
+    buffer[length] = '\0';
     call = buffer;
   }
   if (delimiter2 != NULL)
@@ -97,6 +98,7 @@ void BrandMeisterBridge::setTalker(const char* call, const char* name)
     size_t length = delimiter2 - name;
     char* buffer = (char*)alloca(length + sizeof(uint32_t));
     strncpy(buffer, name, length);
+    buffer[length] = '\0';
     name = buffer;
   }
 
diff --git a/SVXLink/echolink/PatchCord.cpp b/SVXLink/echolink/PatchCord.cpp
index dfd319b..85b444c 100644
--- a/SVXLink/echolink/PatchCord.cpp
+++ b/SVXLink/echolink/PatchCord.cpp
@@ -213,13 +213,13 @@ uint32_t PatchCord::getPrivateIDForCall(const char* call)
 
     message = dbus_pending_call_steal_reply(pending);
 
-    uint32_t number;
-    uint32_t algorithm;
-    uint32_t key;
-    uint32_t interval;
-    uint32_t capabilities;
+    dbus_uint32_t number;
+    dbus_uint32_t algorithm;
+    dbus_uint32_t key;
+    dbus_uint32_t interval;
+    dbus_uint32_t capabilities;
+    dbus_uint32_t station;
     const char* language;
-    uint32_t station;
     const char* call;
     const char* text;
     const char* symbol;
@@ -266,13 +266,13 @@ bool PatchCord::getCredentialsForID(uint32_t number, char* call, char* text)
 
     message = dbus_pending_call_steal_reply(pending);
 
-    uint32_t number;
-    uint32_t algorithm;
-    uint32_t key;
-    uint32_t interval;
-    uint32_t capabilities;
+    dbus_uint32_t number;
+    dbus_uint32_t algorithm;
+    dbus_uint32_t key;
+    dbus_uint32_t interval;
+    dbus_uint32_t capabilities;
+    dbus_uint32_t station;
     const char* language;
-    uint32_t station;
     const char* value1;
     const char* value2;
     const char* symbol;