diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index ce029973b4..f97eb8388f 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -1376,7 +1376,19 @@ AC_ARG_ENABLE(convert-32-rgb-rot-90,
 # Setting have_valgrind to "no" seems pointless, but we just need to
 # put something in as the 4th parameter, so configure doesn't abort
 # when valgrind.pc isn't found.
+have_valgrind="no"
 PKG_CHECK_MODULES(VALGRIND, valgrind, have_valgrind=yes, have_valgrind=no)
+AC_ARG_ENABLE(valgrind,
+  [  --enable-valgrind               enable valgrind fixes to stop false reports], [
+      if [ test "$enableval" = "yes" ]; then
+        AC_MSG_RESULT(yes)
+        have_valgrind="yes"
+      else
+        AC_MSG_RESULT(no)
+	have_valgrind="no"
+      fi
+  ], [ have_valgrind=$have_valgrind ]
+)
 
 if test x$have_valgrind = "xyes"; then
   AC_DEFINE(HAVE_VALGRIND, 1, [Valgrind support])
diff --git a/legacy/evas/make_cross_compile_arm.sh b/legacy/evas/make_cross_compile_arm.sh
index 3ab4a3e197..5bb5372fed 100755
--- a/legacy/evas/make_cross_compile_arm.sh
+++ b/legacy/evas/make_cross_compile_arm.sh
@@ -59,7 +59,8 @@ export CFLAGS=-O9
 --disable-convert-32-bgrx-8888 \
 --disable-convert-32-rgb-rot-0 \
 --disable-convert-32-rgb-rot-270 \
---disable-convert-32-rgb-rot-90
+--disable-convert-32-rgb-rot-90 \
+--disable-valgrind
 
 INST="/tmp/"$PROJ"-instroot"
 sudo rm -rf $INST
diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c
index 346cd2c8c2..e12b47158f 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_query.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_query.c
@@ -253,8 +253,8 @@ evas_common_font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y
 	     chr_w += (chr_x - prev_chr_end);
 	     chr_x = prev_chr_end;
 	  }
-	if ((x >= chr_x) && (x < (chr_x + chr_w)) &&
-	    (y >= -asc) && (y < desc))
+	if ((x >= chr_x) && (x <= (chr_x + chr_w)) &&
+	    (y >= -asc) && (y <= desc))
 	  {
 	     if (cx) *cx = chr_x;
 	     if (cy) *cy = -asc;