diff --git a/android/avrcp.c b/android/avrcp.c
index 8c3e25a..f4b138b 100644
--- a/android/avrcp.c
+++ b/android/avrcp.c
@@ -515,12 +515,17 @@
 	return record;
 }
 
+static void queue_free(void *data, void *user_data)
+{
+	g_free(data);
+}
+
 static void avrcp_device_free(void *data)
 {
 	struct avrcp_device *dev = data;
 
 	if (dev->queue) {
-		g_queue_foreach(dev->queue, (GFunc) g_free, NULL);
+		g_queue_foreach(dev->queue, queue_free, NULL);
 		g_queue_free(dev->queue);
 	}
 
diff --git a/android/system-emulator.c b/android/system-emulator.c
index 61fb496..1545dce 100644
--- a/android/system-emulator.c
+++ b/android/system-emulator.c
@@ -86,7 +86,7 @@
 
 static void ctl_start(void)
 {
-	char prg_name[PATH_MAX];
+	char prg_name[PATH_MAX + 11];
 	pid_t pid;
 
 	snprintf(prg_name, sizeof(prg_name), "%s/%s", exec_dir, "bluetoothd");
@@ -114,7 +114,7 @@
 
 static void snoop_start(void)
 {
-	char prg_name[PATH_MAX];
+	char prg_name[PATH_MAX + 17];
 	char *prg_argv[3];
 	char *prg_envp[1];
 	pid_t pid;