diff --git a/src/mod/applications/mod_rad_auth/Makefile b/src/mod/applications/mod_rad_auth/Makefile
index c00bce2cc2..d2e91c24b3 100644
--- a/src/mod/applications/mod_rad_auth/Makefile
+++ b/src/mod/applications/mod_rad_auth/Makefile
@@ -1,7 +1,14 @@
 switch_srcdir=../../../..
 
-FREERADIUSLA=/usr/local/lib/libfreeradius-client.so
-LOCAL_LIBADD=$(FREERADIUSLA)
+RADCLIENT_VERSION=1.1.6
+RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
+RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
+RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
+RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
+RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
+
+LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include
+LOCAL_LIBADD=$(RADCLIENT_LA)
 
 include $(switch_srcdir)/build/modmake.rules
 
diff --git a/src/mod/endpoints/mod_media_gateway/mod_media_gateway.c b/src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
index ebad0b30b7..58a8794fad 100644
--- a/src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
+++ b/src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
@@ -12,9 +12,9 @@
 struct megaco_globals megaco_globals;
 static sng_mg_event_interface_t sng_event;
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_megaco_shutdown);
-SWITCH_MODULE_DEFINITION(mod_megaco, mod_megaco_load, mod_megaco_shutdown, NULL);
+SWITCH_MODULE_LOAD_FUNCTION(mod_media_gateway_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_media_gateway_shutdown);
+SWITCH_MODULE_DEFINITION(mod_media_gateway, mod_media_gateway_load, mod_media_gateway_shutdown, NULL);
 
 SWITCH_STANDARD_API(megaco_function)
 {
@@ -51,7 +51,7 @@ static switch_status_t list_profiles(const char *line, const char *cursor, switc
 	return status;
 }
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load)
+SWITCH_MODULE_LOAD_FUNCTION(mod_media_gateway_load)
 {
 	switch_api_interface_t *api_interface;
 	
@@ -93,7 +93,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load)
 	return sng_mgco_init(&sng_event);
 }
 
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_megaco_shutdown)
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_media_gateway_shutdown)
 {
 	sng_mgco_stack_shutdown();