diff --git a/src/gnome/account-tree.c b/src/gnome/account-tree.c
index 1fd0d2aa46..e00f83c03e 100644
--- a/src/gnome/account-tree.c
+++ b/src/gnome/account-tree.c
@@ -936,9 +936,9 @@ gnc_account_tree_insert_row(GNCAccountTree *tree,
 
   for (i = 0; i < tree->num_columns; i++)
   {
-    text[i] = gnc_ui_get_account_field_value_string(acc,
-						    tree->column_fields[i]);
-    text[i] = g_strdup(text[i]);
+    text[i] = g_strdup(
+                  gnc_ui_get_account_field_value_string(acc,
+						    tree->column_fields[i]));
   }
 
   text[tree->num_columns] = NULL;
diff --git a/src/gnome/account-tree.h b/src/gnome/account-tree.h
index 3c8ae0faae..5cf2f7f88a 100644
--- a/src/gnome/account-tree.h
+++ b/src/gnome/account-tree.h
@@ -65,7 +65,7 @@ struct _GNCAccountTree
   gint    total_column;
   gint    column_fields[NUM_ACCOUNT_FIELDS];
 
-  gchar * column_headings[NUM_ACCOUNT_FIELDS + 1];
+  const gchar * column_headings[NUM_ACCOUNT_FIELDS + 1];
 
   GtkStyle *deficit_style;
 
diff --git a/src/gnome/dialog-edit.c b/src/gnome/dialog-edit.c
index e58a9d8de1..3ee638ddc4 100644
--- a/src/gnome/dialog-edit.c
+++ b/src/gnome/dialog-edit.c
@@ -349,8 +349,8 @@ fill_helper(gpointer key, gpointer value, gpointer data)
     return;
 
   strings[0] = xaccAccountGetFullName(account, gnc_get_account_separator());
-  strings[1] = gnc_ui_get_account_field_name(fs->field);
-  strings[2] = gnc_ui_get_account_field_value_string(account, fs->field);
+  strings[1] = (gchar *) gnc_ui_get_account_field_name(fs->field);
+  strings[2] = (gchar *) gnc_ui_get_account_field_value_string(account, fs->field);
   strings[4] = NULL;
 
   switch (fs->field)
diff --git a/src/gnome/dialog-transfer.c b/src/gnome/dialog-transfer.c
index 96ec6033fe..65df3e8ec0 100644
--- a/src/gnome/dialog-transfer.c
+++ b/src/gnome/dialog-transfer.c
@@ -136,7 +136,7 @@ gnc_xfer_update_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
   XferDialog *xferData = data;
   Account *account;
   gchar *new_string;
-  gchar *currency;
+  const char *currency;
   gchar *string;
   double value;
 
diff --git a/src/gnome/dialog-utils.c b/src/gnome/dialog-utils.c
index 7a60ad63cb..bcab2bfb90 100644
--- a/src/gnome/dialog-utils.c
+++ b/src/gnome/dialog-utils.c
@@ -89,9 +89,10 @@ GtkWidget *
 gnc_ui_create_account_label(int field_type)
 {
   GtkWidget *label;
-  gchar *label_string = gnc_ui_get_account_field_name(field_type);
+  gchar *label_string;
+  const gchar *l = gnc_ui_get_account_field_name(field_type);
 
-  label_string = g_strconcat(label_string, ":", NULL);
+  label_string = g_strconcat(l, ":", NULL);
 
   label = gtk_label_new (label_string);
   gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5);
@@ -534,7 +535,7 @@ gnc_ui_install_field_strings(Account * account,
 			     gboolean new_code)
 {
   int accType;
-  gchar * old;
+  const char * old;
 
   xaccAccountSetName(account, strings->name);
   xaccAccountSetDescription(account, strings->description);
@@ -570,7 +571,7 @@ gnc_ui_install_field_strings(Account * account,
 
 /* =========================================================== */
 
-char *
+const char *
 gnc_ui_get_account_field_name(int field)
 {
   assert((field >= 0) && (field < NUM_ACCOUNT_FIELDS));
@@ -643,7 +644,7 @@ gnc_ui_account_get_balance(Account *account, gboolean include_children)
 }
 
 
-char *
+const char *
 gnc_ui_get_account_field_value_string(Account *account, int field)
 {
   if (account == NULL)
@@ -684,7 +685,7 @@ gnc_ui_get_account_field_value_string(Account *account, int field)
       break;
     case ACCOUNT_BALANCE_EURO :
       {
-	char *account_currency = xaccAccountGetCurrency(account);
+	const char *account_currency = xaccAccountGetCurrency(account);
         double balance = gnc_ui_account_get_balance(account, FALSE);
 	double euro_balance = gnc_convert_to_euro(account_currency, balance);
 
@@ -701,7 +702,7 @@ gnc_ui_get_account_field_value_string(Account *account, int field)
       break;
     case ACCOUNT_TOTAL_EURO :
       {
-	char *account_currency = xaccAccountGetCurrency(account);
+	const char *account_currency = xaccAccountGetCurrency(account);
 	double balance = gnc_ui_account_get_balance(account, TRUE);
 	double euro_balance = gnc_convert_to_euro(account_currency, balance);
 
diff --git a/src/gnome/dialog-utils.h b/src/gnome/dialog-utils.h
index 72002e8f26..bce5bbe619 100644
--- a/src/gnome/dialog-utils.h
+++ b/src/gnome/dialog-utils.h
@@ -108,9 +108,9 @@ struct _GNCOptionInfo
 
 
 /**** PROTOTYPES *************************************************/
-char * gnc_ui_get_account_field_name(int field);
+const char * gnc_ui_get_account_field_name(int field);
 
-char * gnc_ui_get_account_field_value_string(Account *account, int field);
+const char * gnc_ui_get_account_field_value_string(Account *account, int field);
 
 double gnc_ui_account_get_balance(Account *account, gboolean include_children);
 
diff --git a/src/gnome/reconcile-list.c b/src/gnome/reconcile-list.c
index cbf13ad496..7b7fc9da27 100644
--- a/src/gnome/reconcile-list.c
+++ b/src/gnome/reconcile-list.c
@@ -580,8 +580,7 @@ gnc_reconcile_list_fill(GNCReconcileList *list)
   Transaction *trans;
   Split **splits;
   Split *split;
-
-  char *currency;
+  const char *currency;
   char recn_str[2];
   char recn;
 
@@ -620,8 +619,8 @@ gnc_reconcile_list_fill(GNCReconcileList *list)
     trans = xaccSplitGetParent(split);
 
     strings[0] = xaccTransGetDateStr(trans);
-    strings[1] = xaccTransGetNum(trans);
-    strings[2] = xaccTransGetDescription(trans);
+    strings[1] = (char *) xaccTransGetNum(trans);
+    strings[2] = (char *) xaccTransGetDescription(trans);
     strings[3] = xaccPrintAmount(DABS(amount), flags, currency);
 
     reconciled = g_hash_table_lookup(list->reconciled, split) != NULL;
diff --git a/src/gnome/window-adjust.c b/src/gnome/window-adjust.c
index f3c303c146..7aaec6e1b4 100644
--- a/src/gnome/window-adjust.c
+++ b/src/gnome/window-adjust.c
@@ -156,7 +156,7 @@ gnc_adjust_update_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
   GtkEntry *entry = GTK_ENTRY(widget);
   Account *account = data;
   gchar *new_string;
-  gchar *currency;
+  const char *currency;
   gchar *string;
   double value;
 
@@ -249,7 +249,7 @@ adjBWindow(Account *account)
     GtkWidget *hbox, *vbox;
     GtkWidget *amount, *date;
     GtkWidget *label, *entry;
-    gchar *currency;
+    const char *currency;
     gchar *string;
 
     tooltips = gtk_tooltips_new();
diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c
index f14bf0b971..4c21d3796c 100644
--- a/src/gnome/window-reconcile.c
+++ b/src/gnome/window-reconcile.c
@@ -168,7 +168,7 @@ static double
 recnRecalculateBalance(RecnWindow *recnData)
 {
   char *amount;
-  char *currency;
+  const char *currency;
   double debit;
   double credit;
   double starting;
@@ -256,7 +256,7 @@ gnc_start_recn_update_cb(GtkWidget *widget, GdkEventFocus *event,
   GNCPrintAmountFlags flags;
   Account *account = data;
   int account_type;
-  char  *currency;
+  const char  *currency;
   gchar *new_string;
   gchar *string;
   double value;
@@ -303,7 +303,8 @@ startRecnWindow(GtkWidget *parent, Account *account,
                 double *new_ending, time_t *statement_date)
 {
   GtkWidget *dialog, *end_value, *date_value;
-  char *amount, *title, *currency;
+  char *amount, *title;
+  const char *currency;
   GNCAccountType account_type;
   GNCPrintAmountFlags flags;
   double dendBalance;
diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c
index 4a0d2f9c10..2e9b44ea8a 100644
--- a/src/gnome/window-register.c
+++ b/src/gnome/window-register.c
@@ -1,7 +1,7 @@
 /*******************************************************************\
  * window-register.c -- the register window for GnuCash             *
  * Copyright (C) 1997 Robin D. Clark                                *
- * Copyright (C) 1997, 1998 Linas Vepstas                           *
+ * Copyright (C) 1997-1998 Linas Vepstas <linas@linas.org>          *
  * Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu>              *
  * Copyright (C) 1999-2000 Dave Peticolas <peticola@cs.ucdavis.edu> *
  *                                                                  *
@@ -1722,7 +1722,7 @@ regRefresh(xaccLedgerDisplay *ledger)
   gboolean euro = gnc_lookup_boolean_option("International",
 					    "Enable EURO support",
 					    FALSE);
-  char *currency = xaccAccountGetCurrency(ledger->leader);
+  const char *currency = xaccAccountGetCurrency(ledger->leader);
 
   /* no EURO converson, if account is already EURO or no EURO currency */
   euro = (euro && strncasecmp("EUR", currency, 3) &&