--- libmcal/icap/icap.c	2003-01-28 18:31:33.000000000 +0100
+++ libmcal/icap/icap.c	2005-08-12 15:04:36.000000000 +0200
@@ -159,7 +159,7 @@ 
 	if (!reopen) {
 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
 			goto fail;
-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
 			goto fail;
 
 		/* Copy host. */
--- libmcal/mstore/mstore.c	2005-08-12 15:30:52.000000000 +0200
+++ libmcal/mstore/mstore.c	2005-08-12 15:31:38.000000000 +0200
@@ -308,7 +308,7 @@ 
 	if (!reopen) {
 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
 			goto fail;
-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
 			goto fail;
 	}
 
@@ -773,7 +773,7 @@ 
         while((event=read_event(calfile))) {
 	  if (event->id == modified_event->id)
 	    {
-	    (const CALEVENT*)event = modified_event;         
+	    event = modified_event;         
 	  /*is more required here to assign objects, a loop through all the properties*/
 	    /*    We actually only want to modify any individual property, not the whole thing..
 		  TODO */