diff --git a/build/buildlib.sh b/build/buildlib.sh
index da889b918d..510c89d135 100755
--- a/build/buildlib.sh
+++ b/build/buildlib.sh
@@ -67,7 +67,7 @@ if [ -f ../$uncompressed.build.sh ] ; then
     MAKE=$MAKE ../$uncompressed.build.sh $@
 else
     $MAKE clean 2>&1
-    sh CFLAGS=$MOD_CFLAGS ./configure $@
+    CFLAGS="$MOD_CFLAGS" ; export CFLAGS; sh ./configure $@
 
     if [ $? = 0 ] ; then
 	$MAKE
diff --git a/src/switch_utils.c b/src/switch_utils.c
index 056189a308..a528736b1c 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -52,7 +52,7 @@ static char RFC2833_CHARS[] = "0123456789*#ABCDF";
 
 SWITCH_DECLARE(char) switch_rfc2833_to_char(int event)
 {
-	if (event > -1 && event < sizeof(RFC2833_CHARS)) {
+	if (event > -1 && event < (int32_t) sizeof(RFC2833_CHARS)) {
 		return RFC2833_CHARS[event];
 	}
 	return '\0';