diff --git a/ChangeLog b/ChangeLog
index 6a8f34585..6c8d0ecac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-06  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSMapTable.m: Delete line teft over by accident ... could
+	cause crach if passes nul table.  Thanks to Lars Sonchocky-Helldorf
+	* Source/NSCalendarDate.m: ([-initWithString:calendarFormat:]) don't
+	supply current date information as default ... for compatibility
+	with MacOS-X use zero date instead. Thanks to lcampbell.
+
 2002-05-04  Adam Fedor  <fedor@gnu.org>
 
         * Testing/nsbundle.m: Update to work without installing bundle.
diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m
index 196ae0fd5..24b5c93b7 100644
--- a/Source/NSCalendarDate.m
+++ b/Source/NSCalendarDate.m
@@ -893,31 +893,6 @@ static inline int getDigits(const char *from, char *to, int limit)
 	  had |= hadD;
 	}
 
-      /*
-       * Use current date/time information for anything missing.
-       */
-      if ((had & (hadY|hadM|hadD|hadh|hadm|hads))
-	!= (hadY|hadM|hadD|hadh|hadm|hads))
-	{
-	  NSCalendarDate	*now = [NSCalendarDate  date];
-	  int			Y, M, D, h, m, s;
-
-	  [now setTimeZone: tz];
-	  [now getYear: &Y month: &M day: &D hour: &h minute: &m second: &s];
-	  if ((had & hadY) == 0)
-	    year = Y;
-	  if ((had & hadM) == 0)
-	    month = M;
-	  if ((had & hadD) == 0)
-	    day = D;
-	  if ((had & hadh) == 0)
-	    hour = h;
-	  if ((had & hadm) == 0)
-	    min = m;
-	  if ((had & hads) == 0)
-	    sec = s;
-	}
-
       return [self initWithYear: year
 			  month: month
 			    day: day
diff --git a/Source/NSMapTable.m b/Source/NSMapTable.m
index 735472270..030c1aa7c 100644
--- a/Source/NSMapTable.m
+++ b/Source/NSMapTable.m
@@ -338,7 +338,7 @@ NSFreeMapTable(NSMapTable *table)
 void *
 NSMapGet(NSMapTable *table, const void *key)
 {
-  GSIMapNode	n = GSIMapNodeForKey((GSIMapTable)table, (GSIMapKey)key);
+  GSIMapNode	n;
 
   if (table == 0)
     {