diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index 3e2a31a355..a669c2a298 100644
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -1,9 +1,7 @@
 BASE=../../../..
+DIR=$(BASE)/libs/libg729
+A=$(DIR)/.libs/libg729.a
 
-DIR=$(switch_srcdir)/libs/libg729
-BUILDDIR=$(switch_builddir)/libs/libg729
-A=$(BUILDDIR)/.libs/libg729.a
-
-LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include -I${DIR}" ; else echo "-DG729_PASSTHROUGH" ; fi ;
 LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 
 include $(BASE)/build/modmake.rules
diff --git a/src/mod/codecs/mod_g729/mod_g729.c b/src/mod/codecs/mod_g729/mod_g729.c
index b3e0fe8e68..790dd50a9e 100644
--- a/src/mod/codecs/mod_g729/mod_g729.c
+++ b/src/mod/codecs/mod_g729/mod_g729.c
@@ -38,7 +38,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_g729_load);
 SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
 
 #ifndef G729_PASSTHROUGH
-#include "g729.h"
+#include "g729ab.h"
 
 struct g729_context {
 	struct dec_state decoder_object;
diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 9867c79f05..2234340573 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1256,6 +1256,9 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
 	
 	switch_core_hash_init(&sql_manager.dbh_hash, sql_manager.memory_pool);
 
+	if (!manage) {
+		return SWITCH_STATUS_SUCCESS;
+	}
  top:
 	
 	/* Activate SQL database */
diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 21a79f6393..7135ae5ff5 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -2609,7 +2609,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 							switch_channel_t *b_channel = originate_status[oglobals.bridge_early_media].peer_channel;
 							switch_core_session_t *b_session = originate_status[oglobals.bridge_early_media].peer_session;
 							switch_status_t b_status = SWITCH_STATUS_FALSE;
-							switch_frame_t *b_frame;
+							switch_frame_t *b_frame = NULL;
 							
 							if (b_channel && b_session) {
 								b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0);