diff --git a/modules.conf b/modules.conf
index fbfa61505e..2096e1ff46 100644
--- a/modules.conf
+++ b/modules.conf
@@ -1,11 +1,11 @@
 applications/mod_bridgecall
 applications/mod_playback
 #applications/mod_skel
-codecs/mod_codec_g729
+#codecs/mod_codec_g729
 codecs/mod_codec_gsm
 codecs/mod_g711codec
 codecs/mod_rawaudio
-codecs/mod_speexcodec
+#codecs/mod_speexcodec
 dialplans/mod_dialplan_demo
 endpoints/mod_exosip
 endpoints/mod_iaxchan
diff --git a/src/mod/codecs/mod_codec_g729/Makefile b/src/mod/codecs/mod_codec_g729/Makefile
index fbc86d50d8..745616eede 100644
--- a/src/mod/codecs/mod_codec_g729/Makefile
+++ b/src/mod/codecs/mod_codec_g729/Makefile
@@ -1,7 +1,9 @@
-CFLAGS += -I/usr/local/include/libg729
 LDFLAGS +=-lg729
 
-all:	$(MODNAME).so
+all:	depends $(MODNAME).so
+
+depends:
+	$(BASE)/buildlib.sh $(BASE) install codec/libg729 --prefix=$(PREFIX)
 
 $(MODNAME).so: $(MODNAME).c
 	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
diff --git a/src/switch_core.c b/src/switch_core.c
index 44fb016087..61fa15d9e4 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -362,14 +362,14 @@ SWITCH_DECLARE(switch_status) switch_core_file_read(switch_file_handle *fh, void
 {
 	assert(fh != NULL);
 
-	return fh->file_interface->file_read(fh, data, (int *)len);
+	return fh->file_interface->file_read(fh, data, (unsigned int *)len);
 }
 
 SWITCH_DECLARE(switch_status) switch_core_file_write(switch_file_handle *fh, void *data, size_t *len)
 {
 	assert(fh != NULL);
 
-	return fh->file_interface->file_write(fh, data, (int *)len);
+	return fh->file_interface->file_write(fh, data, (unsigned int *)len);
 }
 
 SWITCH_DECLARE(switch_status) switch_core_file_seek(switch_file_handle *fh, unsigned int *cur_pos, unsigned int samples, int whence)