diff --git a/conf/modules.conf b/conf/modules.conf
index fb67358a63..92c122a099 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -7,6 +7,7 @@
 ; Full paths will be taken "as is" (eg /some/dir/mymod.so)
 
 ; Event Handlers
+;load => mod_event_multicast
 load => mod_zeroconf
 load => mod_xmpp_event
 
diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index a9e58b2ffc..e4943de40a 100644
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -85,6 +85,15 @@ extern "C" {
 /** Structure for referencing files. */
 typedef apr_file_t switch_file_t;
 
+#define SWITCH_SO_LINGER APR_SO_LINGER
+#define SWITCH_SO_KEEPALIVE APR_SO_KEEPALIVE
+#define SWITCH_SO_DEBUG APR_SO_DEBUG
+#define SWITCH_SO_NONBLOCK APR_SO_NONBLOCK
+#define SWITCH_SO_REUSEADDR APR_SO_REUSEADDR
+#define SWITCH_SO_SNDBUF APR_SO_SNDBUF
+#define SWITCH_SO_RCVBUF APR_SO_RCVBUF
+#define SWITCH_SO_DISCONNECTED APR_SO_DISCONNECTED
+
 /**
  * @defgroup switch_file_permissions File Permissions flags 
  * @ingroup switch_file_io
diff --git a/src/mod/event_handlers/mod_event_test/mod_event_test.c b/src/mod/event_handlers/mod_event_test/mod_event_test.c
index 761ca0e6cc..3383aa22f1 100644
--- a/src/mod/event_handlers/mod_event_test/mod_event_test.c
+++ b/src/mod/event_handlers/mod_event_test/mod_event_test.c
@@ -33,6 +33,9 @@
 
 static const char modname[] = "mod_event_test";
 
+//#define TORTURE_ME
+
+
 static void event_handler(switch_event *event)
 {
 	char buf[1024];
@@ -49,6 +52,7 @@ static void event_handler(switch_event *event)
 }
 
 
+
 static switch_loadable_module_interface event_test_module_interface = {
 	/*.module_name */ modname,
 	/*.endpoint_interface */ NULL,
@@ -61,8 +65,6 @@ static switch_loadable_module_interface event_test_module_interface = {
 #define MY_EVENT_COOL "test::cool"
 
 
-//#define TORTURE_ME
-
 #ifdef TORTURE_ME
 #define TTHREADS 500
 static int THREADS = 0;
@@ -113,13 +115,14 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't register subclass!");
 		return SWITCH_STATUS_GENERR;
 	}
-#ifdef TORTURE_ME
+
 	if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) !=
 		SWITCH_STATUS_SUCCESS) {
 		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
 		return SWITCH_STATUS_GENERR;
 	}
 
+#ifdef TORTURE_ME
 	if (1) {
 		int x = 0;
 		for (x = 0; x < TTHREADS; x++) {