diff --git a/src/psmove.c b/src/psmove.c
index ccdff8f1..43bb00ae 100644
--- a/src/psmove.c
+++ b/src/psmove.c
@@ -565,7 +565,9 @@ psmove_connect_internal(const wchar_t *serial, const char *path, int id, unsigne
         if (move->connection_type == Conn_Unknown) {
             move->connection_type = Conn_USB;
         }
-        move->serial_number = psmove_get_serial(move);
+        char* new_serial = psmove_get_serial(move);
+        free(move->serial_number);
+        move->serial_number = new_serial;
     }
 
     // Recently disconnected controllers might still show up in hidapi (especially Windows).
@@ -916,7 +918,7 @@ psmove_connect()
 int
 _psmove_read_btaddrs(PSMove *move, PSMove_Data_BTAddr *host, PSMove_Data_BTAddr *controller)
 {
-    unsigned char btg[PSMOVE_MAX_BTADDR_GET_SIZE];
+    unsigned char btg[PSMOVE_MAX_BTADDR_GET_SIZE] = {0};
     size_t report_size = PSMOVE_BTADDR_GET_SIZE;
     int res;