diff --git a/cde/programs/dtcm/dtcm/group_editor.c b/cde/programs/dtcm/dtcm/group_editor.c
index cb51f948f..9c528e360 100644
--- a/cde/programs/dtcm/dtcm/group_editor.c
+++ b/cde/programs/dtcm/dtcm/group_editor.c
@@ -1685,13 +1685,14 @@ add_to_gaccess_list(
 	char		access, *buf;
 	XmString	xmstr;
 	Calendar	*c;
-	Props_pu	*p = (Props_pu *)ge->cal->properties_pu;
+	Props_pu	*p;
 	Access_data	*new_data = NULL;
 
 	if (!ge)
 		return;
 
 	c = ge->cal;
+	p = (Props_pu *)c->properties_pu;
 
 	while (ge->access_data && cnt <= ge->access_data->count) {
 		new_data = (Access_data *)
diff --git a/cde/programs/dtcm/dtcm/misc.c b/cde/programs/dtcm/dtcm/misc.c
index 118ad3d12..1b8b18a8e 100644
--- a/cde/programs/dtcm/dtcm/misc.c
+++ b/cde/programs/dtcm/dtcm/misc.c
@@ -621,8 +621,8 @@ cm_mbstrlen(char *s) {
 */
 extern char *
 cm_mbchar(char *str) {
-     static char *string;
-     static char *string_head;
+     static char *string = NULL;
+     static char *string_head = NULL;
      static char *buf = NULL;
      int num_byte = 0;
  
diff --git a/cde/programs/dtcm/dtcm/rfp.c b/cde/programs/dtcm/dtcm/rfp.c
index 458768623..0615b38fc 100644
--- a/cde/programs/dtcm/dtcm/rfp.c
+++ b/cde/programs/dtcm/dtcm/rfp.c
@@ -214,7 +214,7 @@ rfp_apply_proc(Widget w, XtPointer client_data, XtPointer cbs) {
 	char			*str, buf[128];
 	XmString		xmstr;
         Calendar 		*c;
-	Props_pu		*pu = (Props_pu *)c->properties_pu;
+	Props_pu		*pu;
 	Repeat_scope_menu_op	op = REPEAT_DAYS;
 	char			*repeat_str;
 
@@ -222,6 +222,7 @@ rfp_apply_proc(Widget w, XtPointer client_data, XtPointer cbs) {
 		return;
 
 	c = rfp->cal;
+	pu = (Props_pu *)c->properties_pu;
 
 	str = XmTextGetString(rfp->repeat_popup_text);