diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index a3633d50eb..1c494bfa1e 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -54,12 +54,12 @@ AC_CHECK_LIB(Xext, XShmAttach, x_libs="-lXext $x_libs",
 AC_CHECK_LIB(Xext, XShapeCombineMask, x_libs="-lXext $x_libs",
              AC_MSG_ERROR([ERROR: XShape not found.]); exit,
 	     $x_libs)
-AC_CHECK_LIB(Xrender, XRenderCreatePicture, 
-             [ x_libs=" -lXrender -lXext $x_libs";
-	       AC_DEFINE(HAVE_RENDER)
-	     ],
-             [],
-	     $x_libs)
+#AC_CHECK_LIB(Xrender, XRenderCreatePicture, 
+#             [ x_libs=" -lXrender -lXext $x_libs";
+#	       AC_DEFINE(HAVE_RENDER)
+#	     ],
+#             [],
+#	     $x_libs)
 
 #### Find out about E db
 #AC_CHECK_HEADER(Edb.h,
diff --git a/legacy/evas/src/evas_gl_routines.c b/legacy/evas/src/evas_gl_routines.c
index 48a2d00776..4fc6d3fafa 100644
--- a/legacy/evas/src/evas_gl_routines.c
+++ b/legacy/evas/src/evas_gl_routines.c
@@ -881,7 +881,6 @@ __evas_gl_text_paste(Evas_GL_Font *f, char *text,
 
    if ((__evas_current_win != win) || (__evas_current_disp != disp))
      {
-	printf("%p %x %p\n", disp, win, f->context);
 	glXMakeCurrent(disp, win, f->context);
 	__evas_current_disp = disp;
 	__evas_current_win = win;
@@ -1504,11 +1503,15 @@ __evas_gl_text_font_new(Display *disp, char *font, int size)
 					      &att);
 	f->buffer.window = __evas_context_window;
 	glXMakeCurrent(f->buffer.display, f->buffer.window, f->context);
+	__evas_current_disp = f->buffer.display;
+	__evas_current_win = f->buffer.window;	
      }
    else
      {
 	f->buffer.window = __evas_context_window;
 	glXMakeCurrent(f->buffer.display, f->buffer.window, f->context);
+	__evas_current_disp = f->buffer.display;
+	__evas_current_win = f->buffer.window;	
      }
    __evas_gl_text_font_render_textures(f);
    __evas_fonts = evas_list_prepend(__evas_fonts, f);
diff --git a/legacy/evas/test/evas_test.c b/legacy/evas/test/evas_test.c
index b57a935b37..95dc0860a3 100644
--- a/legacy/evas/test/evas_test.c
+++ b/legacy/evas/test/evas_test.c
@@ -788,7 +788,7 @@ setup(void)
 
    evas_control = evas_new_all(display, win_base, 0, 0, 128,768, 
 			       RENDER_METHOD_ALPHA_SOFTWARE, 216,
-			       4 * 1024 * 1024, 16 * 1024 * 1024,
+			       4 * 1024 * 1024, 8 * 1024 * 1024,
 			       FNTDIR);
    win_control = evas_get_window(evas_control);
 
@@ -892,7 +892,7 @@ setup_view(Evas_Render_Method method)
    double x, y;
 
    e = evas_new_all(display, win_base, 128, 0, 1024 - 128, 768,
-			    method, 216, 4 * 1024 * 1024, 16 * 1024 * 1024,
+			    method, 216, 4 * 1024 * 1024, 4 * 1024 * 1024,
 			    FNTDIR);
 /*   
    if (method == RENDER_METHOD_BASIC_HARDWARE)