diff --git a/src/switch_apr.c b/src/switch_apr.c
index f1f64df360..81b448eba5 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -269,6 +269,11 @@ SWITCH_DECLARE(switch_status_t) switch_thread_rwlock_unlock(switch_thread_rwlock
 
 SWITCH_DECLARE(switch_status_t) switch_mutex_init(switch_mutex_t ** lock, unsigned int flags, switch_memory_pool_t *pool)
 {
+#ifdef WIN32
+	/* Old version of APR misunderstands mutexes. On Windows, mutexes are cross-process. 
+	   APR has no reason to not use critical sections instead of mutexes. */
+	if (flags == SWITCH_MUTEX_NESTED) flags = SWITCH_MUTEX_DEFAULT;
+#endif
 	return apr_thread_mutex_create(lock, flags, pool);
 }
 
diff --git a/src/switch_event.c b/src/switch_event.c
index 7eb574f960..ae73436306 100644
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -1053,7 +1053,7 @@ static switch_status_t switch_event_base_add_header(switch_event_t *event, switc
 			switch_event_del_header(event, header_name);
 		}
 
-		if (strstr(data, "ARRAY::")) {
+		if (!strncmp(data, "ARRAY::", 7)) {
 			switch_event_add_array(event, header_name, data);
 			FREE(data);
 			goto end;