diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index daa494e23d..1026b2110b 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -74,7 +74,7 @@ EXTRA_DIST = \
   gnc-dialogs.glade \
   gnucash.desktop
 
-CFLAGS += ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_COMPILE_ARGS}
+CFLAGS = @CFLAGS@ ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES = \
   -I${top_srcdir}/src \
diff --git a/src/gnome/Makefile.in b/src/gnome/Makefile.in
index 2b87e29b44..b71cbf0e15 100644
--- a/src/gnome/Makefile.in
+++ b/src/gnome/Makefile.in
@@ -131,7 +131,7 @@ noinst_HEADERS =    account-tree.h   account-treeP.h   cursors.h   dialog-accoun
 EXTRA_DIST =    .cvsignore   gnc-dialogs.glade   gnucash.desktop
 
 
-CFLAGS =  ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_COMPILE_ARGS}
+CFLAGS = @CFLAGS@ ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES =    -I${top_srcdir}/src   -I${top_srcdir}/src/engine   -I${top_srcdir}/src/g-wrap   -I${top_srcdir}/src/guile   -I${top_srcdir}/src/register   -I${top_srcdir}/src/register/gnome
 
diff --git a/src/gnome/dialog-edit.c b/src/gnome/dialog-edit.c
index cc7dbdfe66..3a56797248 100644
--- a/src/gnome/dialog-edit.c
+++ b/src/gnome/dialog-edit.c
@@ -73,7 +73,7 @@ struct _editaccwindow
 static int
 gnc_ui_EditAccWindow_close_cb(GnomeDialog *dialog, gpointer user_data)
 {
-  EditAccWindow * editAccData = (EditAccWindow *) user_data;
+  EditAccWindow * editAccData = user_data;
   Account *acc = editAccData->account;
 
   REMOVE_FROM_LIST (EditAccWindow,editAccList,acc,account); 
@@ -96,7 +96,7 @@ static void
 gnc_ui_EditAccWindow_cancel_cb(GtkWidget * widget,
 			       gpointer data)
 {
-  EditAccWindow *editAccData = (EditAccWindow *) data; 
+  EditAccWindow *editAccData = data; 
 
   gnome_dialog_close(GNOME_DIALOG(editAccData->dialog));
 }
@@ -402,6 +402,7 @@ extra_change_verify(EditAccWindow *editAccData,
   Account *account;
   GtkCList *list;
   gchar *titles[5];
+  gboolean result;
   guint size;
 
   if (editAccData == NULL)
@@ -446,6 +447,7 @@ extra_change_verify(EditAccWindow *editAccData,
                               NULL);
 
     gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
+    gnome_dialog_set_close(GNOME_DIALOG(dialog), FALSE);
     gnome_dialog_close_hides(GNOME_DIALOG(dialog), FALSE);
     gnome_dialog_set_parent(GNOME_DIALOG(dialog),
                             GTK_WINDOW(editAccData->dialog));
@@ -471,8 +473,12 @@ extra_change_verify(EditAccWindow *editAccData,
 
     gtk_widget_show_all(vbox);
 
-    return gnome_dialog_run_and_close(GNOME_DIALOG(dialog)) == 0;
+    result = (gnome_dialog_run(GNOME_DIALOG(dialog)) == 0);
+
+    gtk_widget_destroy(dialog);
   }
+
+  return result;
 }
 
 static void
diff --git a/src/gnome/gnc-currency-edit.c b/src/gnome/gnc-currency-edit.c
index d4535be010..5500dfda87 100644
--- a/src/gnome/gnc-currency-edit.c
+++ b/src/gnome/gnc-currency-edit.c
@@ -86,6 +86,7 @@ gnc_currency_edit_class_init (GNCCurrencyEditClass *class)
 	object_class->destroy = gnc_currency_edit_destroy;
 }
 
+#if 0
 static void
 insert_text_cb(GtkEditable *editable, gchar *new_text, gint new_text_length,
                gint *position, gpointer user_data)
@@ -104,6 +105,7 @@ insert_text_cb(GtkEditable *editable, gchar *new_text, gint new_text_length,
                 new_text[i] = toupper(new_text[i]);
         }
 }
+#endif
 
 static void
 gnc_currency_edit_init (GNCCurrencyEdit *gce)
@@ -111,13 +113,15 @@ gnc_currency_edit_init (GNCCurrencyEdit *gce)
         GtkTooltips *tooltips;
 
         gtk_combo_set_use_arrows_always(GTK_COMBO(gce), TRUE);
-        gtk_combo_set_value_in_list(GTK_COMBO(gce), TRUE, TRUE);
+        gtk_combo_set_value_in_list(GTK_COMBO(gce), FALSE, TRUE);
         gtk_combo_disable_activate(GTK_COMBO(gce));
 
+#if 0
         gtk_entry_set_max_length(GTK_ENTRY(GTK_COMBO(gce)->entry), 3);
 
         gtk_signal_connect(GTK_OBJECT(GTK_COMBO(gce)->entry),
                            "insert_text", insert_text_cb, NULL);
+#endif
 
         tooltips = gtk_tooltips_new();
         gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips),