diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index 69335e2b9f33c85adc30d8cdddf6d671039e7210..6ccb30b6df74fc7cff5a3503d4a6bc7b71ddc358 100644
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -758,7 +758,7 @@ mono_debugger_agent_parse_options (char *options)
 			if (agent_config.defer) {
 				agent_config.server = TRUE;
 				if (agent_config.address == NULL) {
-					agent_config.address = g_strdup_printf ("127.0.0.1:%u", 56000 + (GetCurrentProcessId () % 1000));
+					agent_config.address = g_strdup_printf ("0.0.0.0:%u", 56000 + (GetCurrentProcessId () % 1000));
 				}
 			}
 		} else {
@@ -2313,6 +2313,7 @@ suspend_current (void)
 
 	while (suspend_count - tls->resume_count > 0) {
 #ifdef HOST_WIN32
+		/* FIXME: https://bugzilla.novell.com/show_bug.cgi?id=587470 */
 		if (WAIT_TIMEOUT == WaitForSingleObject(suspend_cond, 0))
 		{
 			mono_mutex_unlock (&suspend_mutex);