diff --git a/RestServer/AvocadoServer.cpp b/RestServer/AvocadoServer.cpp
index c2176bc11b..fa1076f7b1 100644
--- a/RestServer/AvocadoServer.cpp
+++ b/RestServer/AvocadoServer.cpp
@@ -167,7 +167,10 @@ AvocadoServer::AvocadoServer (int argc, char** argv)
     _vocbase(0) {
   char* p;
 
-  _binaryPath = TRI_LocateBinaryPath(argv[0]);
+  p = TRI_LocateBinaryPath(argv[0]);
+  _binaryPath = p;
+
+  TRI_FreeString(p);
 
   // .............................................................................
   // use relative system paths
diff --git a/configure b/configure
index d17f9c3550..4dccadf3d6 100755
--- a/configure
+++ b/configure
@@ -5312,6 +5312,7 @@ if test x$GCC == xyes;  then
 
     *)
       WALLCXX="${WALLCXX} -Wstrict-null-sentinel"
+      WALLC="-std=gnu90 ${WALLC}"
       ;;
   esac
 
@@ -5319,7 +5320,7 @@ if test x$GCC == xyes;  then
     WALLCXX="${WALLCXX} -Weffc++"
   fi
 
-  CFLAGS="${CFLAGS} -std=gnu90 ${WALLC}"
+  CFLAGS="${CFLAGS} ${WALLC}"
   CXXFLAGS="${CXXFLAGS} ${WALLCXX}"
 fi
 
diff --git a/m4/configure.basics b/m4/configure.basics
index 7f0b6c99f3..02c7263c41 100644
--- a/m4/configure.basics
+++ b/m4/configure.basics
@@ -100,6 +100,7 @@ if test x$GCC == xyes;  then
 
     *)
       WALLCXX="${WALLCXX} -Wstrict-null-sentinel"
+      WALLC="-std=gnu90 ${WALLC}"
       ;;
   esac
 
@@ -107,7 +108,7 @@ if test x$GCC == xyes;  then
     WALLCXX="${WALLCXX} -Weffc++"
   fi
 
-  CFLAGS="${CFLAGS} -std=gnu90 ${WALLC}"
+  CFLAGS="${CFLAGS} ${WALLC}"
   CXXFLAGS="${CXXFLAGS} ${WALLCXX}"
 fi