diff --git a/ChangeLog b/ChangeLog
index 9108037a6d..6092d67aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-10  Sven Neumann  <sven@gimp.org>
+
+	* app/actions/view-actions.c (view_zoom_explicit_actions): fixed
+	incorrect tooltip (bug #495564).
+
+	* app/dialogs/preferences-dialog.c (prefs_display_options_frame_add):
+	adapt to the changed return value of gimp_prop_enum_combo_box_new().
+
 2007-11-10  Michael Natterer  <mitch@gimp.org>
 
 	* libgimpwidgets/gimppropwidgets.c
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index d133ca26ae..1773344cb5 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -308,7 +308,7 @@ static const GimpRadioActionEntry view_zoom_explicit_actions[] =
 
   { "view-zoom-2-1", NULL,
     N_("_2:1  (200%)"), NULL,
-    N_("Zoom 1:1"),
+    N_("Zoom 2:1"),
     20000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 6856de007c..375b7f4620 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1341,7 +1341,7 @@ prefs_display_options_frame_add (Gimp         *gimp,
 
   g_signal_connect (button, "color-changed",
                     G_CALLBACK (prefs_canvas_padding_color_changed),
-                    gtk_bin_get_child (GTK_BIN (combo)));
+                    combo);
 }
 
 static void
@@ -2362,7 +2362,8 @@ prefs_dialog_new (Gimp       *gimp,
   gtk_widget_show (hbox);
 
   calibrate_button = gtk_button_new_with_mnemonic (_("C_alibrate..."));
-  gtk_misc_set_padding (GTK_MISC (GTK_BIN (calibrate_button)->child), 4, 0);
+  label = gtk_bin_get_child (GTK_BIN (calibrate_button));
+  gtk_misc_set_padding (GTK_MISC (label), 4, 0);
   gtk_box_pack_start (GTK_BOX (hbox), calibrate_button, FALSE, FALSE, 0);
   gtk_widget_show (calibrate_button);
   gtk_widget_set_sensitive (calibrate_button,