diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a51cd455de..b6e5296c95 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-07  JP Rosevear  <jpr@ximian.com>
+
+	* gui/dialogs/task-page.glade: fix button conversion problem
+
+	* gui/dialogs/task-details-page.c
+	(task_details_page_fill_widgets): only free the percent if its
+	non-null
+
 2003-05-07  Rodrigo Moya <rodrigo@ximian.com>
 
 	* cal-client/cal-client.c (cal_client_discard_alarm): added missing
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 9e6a870f4c..17524e2994 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -317,7 +317,8 @@ task_details_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
 	}
 	e_dialog_option_menu_set (priv->status, status, status_map);
 
-	cal_component_free_percent (percent);
+	if (percent)
+		cal_component_free_percent (percent);
 
 	/* Completed Date. */
 	cal_component_get_completed (comp, &completed);
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index 9ebda6eb82..02a8797b45 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -437,22 +437,6 @@
 	      <property name="label" translatable="yes">Ca_tegories...</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label17">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Ca_tegories...</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">4</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>