diff --git a/TODO b/TODO
index 20df3096f1..0631c1a6ac 100644
--- a/TODO
+++ b/TODO
@@ -12,13 +12,9 @@ BUGS
 
  * Notebook: there are a few cosmetic problems left
 
- * Verticle scrollbar: the expose event looks hosed and is causing 
+ * Vertical scrollbar: the expose event looks hosed and is causing 
    quite a bit of flickering
 
- * Entry: the entire text line is getting re-drawn with every keystroke
-   and every mouse selection.  it's causing flickering, this needs to be
-   fixed
-
 NEW FEATURES
 ------------
  * gdk_expose_compress: ala-Xt, this would really help for opaque moves and
@@ -26,9 +22,7 @@ NEW FEATURES
 
 WIDGETS
 -------
- * Tree widget (we have a new copy to look at)
  * Column-list (Jay Painter)
- * Combobox (one around somewhere?)
  * Text widget (needs to be finished)
  * Entry should have a password mode (and it should show stars
    for user feedback)
@@ -43,6 +37,10 @@ DND
   There also needs to be a way to set dnd-data on widget windows which are
   not the main window (for widgets that create more than one window).
     -Jay Painter
+  DnD seems to work for me, but yes, there needs to be some sort of
+  gtk_widget layer that makes it easier... Also, adding support for drop
+  zones might be nice.
+    -- Elliot
 
 OTHER
 -----
diff --git a/config.h.in b/config.h.in
index f092996305..37fc8e5748 100644
--- a/config.h.in
+++ b/config.h.in
@@ -31,3 +31,5 @@
 
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
+
+#undef HAVE_MMAP
diff --git a/configure.in b/configure.in
index 2a54ac8ea7..4f9fe3bbab 100644
--- a/configure.in
+++ b/configure.in
@@ -234,6 +234,7 @@ AC_C_CONST
 
 # Checks for library functions.
 AC_TYPE_SIGNAL
+AC_FUNC_MMAP
 
 # Check for sys/select.h
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 3e34aa4c23..fdf27dbc3d 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -43,8 +43,8 @@ gdkinclude_HEADERS = \
 	gdktypes.h	\
 	gdkx.h
 
-libgdk_la_LDFLAGS = -version-info 1:0:0 \
-	@x_ldflags@ @x_libs@
+libgdk_la_LDFLAGS = -version-info 1:0:0 @x_ldflags@
+libgdk_la_LIBADD = @x_libs@
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib @x_cflags@ 
 
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index d3d9a46e25..a96735ce6a 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -2263,6 +2263,7 @@ create_text ()
       gtk_widget_show (hscrollbar);
 
       vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
+      gtk_widget_set_usize(vscrollbar, 30, -1);
       gtk_table_attach (GTK_TABLE (table), vscrollbar, 1, 2, 0, 1,
 			GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
       gtk_widget_show (vscrollbar);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index d3d9a46e25..a96735ce6a 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2263,6 +2263,7 @@ create_text ()
       gtk_widget_show (hscrollbar);
 
       vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
+      gtk_widget_set_usize(vscrollbar, 30, -1);
       gtk_table_attach (GTK_TABLE (table), vscrollbar, 1, 2, 0, 1,
 			GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
       gtk_widget_show (vscrollbar);