diff --git a/ChangeLog b/ChangeLog
index 6effc8e822..895276d1ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-03  Manish Singh  <yosh@gimp.org>
+
+	* app/actions/qmask-actions.c: initialize is_active for qmask-toggle.
+
+	* app/actions/tools-actions.c: set entry help_id from tool_info,
+	since gimp_action_group_add_string_actions expects it to be there
+	now.
+
 2004-05-03  Sven Neumann  <sven@gimp.org>
 
 	* libgimpwidgets/gimpframe.c (gimp_frame_new): added a hack that
diff --git a/app/actions/qmask-actions.c b/app/actions/qmask-actions.c
index c6076983a7..e866f1df05 100644
--- a/app/actions/qmask-actions.c
+++ b/app/actions/qmask-actions.c
@@ -58,6 +58,7 @@ static GimpToggleActionEntry qmask_toggle_actions[] =
   { "qmask-toggle", GIMP_STOCK_QMASK_ON,
     N_("Toggle _QuickMask"), "<shift>Q", NULL,
     G_CALLBACK (qmask_toggle_cmd_callback),
+    FALSE,
     GIMP_HELP_QMASK_TOGGLE }
 
 };
diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c
index c6076983a7..e866f1df05 100644
--- a/app/actions/quick-mask-actions.c
+++ b/app/actions/quick-mask-actions.c
@@ -58,6 +58,7 @@ static GimpToggleActionEntry qmask_toggle_actions[] =
   { "qmask-toggle", GIMP_STOCK_QMASK_ON,
     N_("Toggle _QuickMask"), "<shift>Q", NULL,
     G_CALLBACK (qmask_toggle_cmd_callback),
+    FALSE,
     GIMP_HELP_QMASK_TOGGLE }
 
 };
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index cc60b47d52..815885cfbd 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -95,6 +95,7 @@ tools_actions_setup (GimpActionGroup *group)
           entry.label       = tool_info->menu_path;
           entry.accelerator = tool_info->menu_accel;
           entry.tooltip     = tool_info->blurb;
+          entry.help_id     = tool_info->help_id;
           entry.value       = identifier;
 
           gimp_action_group_add_string_actions (group,