diff --git a/Makefile b/Makefile
index 8595690a072..10a8adedc31 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,7 @@ ROOT = .
 DIALYZER = dialyzer
 REBAR = $(ROOT)/bin/rebar
 
-MAKEDIRS = lib/rabbitmq_server-2.8.6/Makefile \
-	   lib/rabbitmq_client-2.8.6/Makefile \
-	   lib/lager-1.0.0/Makefile \
-	   lib/*/Makefile \
+MAKEDIRS = lib/*/Makefile \
 	   ecallmgr/Makefile \
 	   whistle_apps/Makefile
 
diff --git a/lib/rabbitmq_client-2.8.6/common.mk b/lib/rabbitmq_client-2.8.6/common.mk
index 442c301b9f1..94c60d93623 100644
--- a/lib/rabbitmq_client-2.8.6/common.mk
+++ b/lib/rabbitmq_client-2.8.6/common.mk
@@ -36,6 +36,7 @@ ifndef TMPDIR
 TMPDIR := /tmp
 endif
 
+ERL_LIBS=../
 EBIN_DIR=ebin
 BROKER_DIR=../rabbitmq_server-2.8.6
 export INCLUDE_DIR=include
diff --git a/whistle_apps/apps/conference/rebar.config b/whistle_apps/apps/conference/rebar.config
index 5b4d451ab26..e06876174d2 100644
--- a/whistle_apps/apps/conference/rebar.config
+++ b/whistle_apps/apps/conference/rebar.config
@@ -2,4 +2,4 @@
 	    ,debug_info
 	   ]}. % uncomment to get debug messages, remove debug_info for production
 {dialyzer_opts, [{warnings, [unmatched_returns, race_conditions, error_handling]}]}.
-{lib_dirs, ["../lib"]}.
+{lib_dirs, ["../../../lib","../../lib"]}.
diff --git a/whistle_apps/src/whistle_apps.erl b/whistle_apps/src/whistle_apps.erl
index 5a7ac685162..e2aca510676 100644
--- a/whistle_apps/src/whistle_apps.erl
+++ b/whistle_apps/src/whistle_apps.erl
@@ -28,6 +28,7 @@ start_deps() ->
     whistle_apps_deps:ensure(),
 
     lager:start(),
+    application:start(cowboy),
 
     case application:get_env(reloader) of
         {ok, true} -> reloader:start();