diff --git a/ChangeLog b/ChangeLog
index cc9db637b..40b505225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-24  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSCalendarDate.m (-initWithString:calendarFormat:locale:): 
+	Set format if nil.
+	(-addYear:month:day:hour:minute:second:): Use signed ints.
+
 2000-10-24  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSString.m: Implement ([-substringWithRange:]) and
diff --git a/Headers/gnustep/base/NSDate.h b/Headers/gnustep/base/NSDate.h
index 3fd6db3e1..561fb6f45 100644
--- a/Headers/gnustep/base/NSDate.h
+++ b/Headers/gnustep/base/NSDate.h
@@ -203,11 +203,11 @@ NSTimeInterval GSTime(int day, int mon, int year, int hour, int min, int sec);
 
 // Providing Adjusted Dates
 - (NSCalendarDate*) addYear: (int)year
-		      month: (unsigned int)month
-			day: (unsigned int)day
-		       hour: (unsigned int)hour
-		     minute: (unsigned int)minute
-		     second: (unsigned int)second;
+		      month: (int)month
+			day: (int)day
+		       hour: (int)hour
+		     minute: (int)minute
+		     second: (int)second;
 
 // Getting String Descriptions of Dates
 - (NSString*) description;
diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m
index 504b99581..b2a500181 100644
--- a/Source/NSCalendarDate.m
+++ b/Source/NSCalendarDate.m
@@ -285,8 +285,8 @@ static inline int getDigits(const char *from, char *to, int limit)
       int		julianWeeks = -1, weekStartsMonday = 0, dayOfWeek = -1;
       const char	*source = [description cString];
       int		sourceLen = strlen(source);
-      const char	*format = [fmt cString];
-      int		formatLen = strlen(format);
+      const char	*format;
+      int		formatLen;
       int		formatIdx = 0;
       int		sourceIdx = 0;
       char		tmpStr[20];
@@ -299,9 +299,12 @@ static inline int getDigits(const char *from, char *to, int limit)
 	}
       if (fmt == nil)
 	{
-	  format = [[locale objectForKey: NSTimeDateFormatString] cString];
-	  formatLen = strlen(format);
+	  fmt = [locale objectForKey: NSTimeDateFormatString];
+	  if (fmt == nil)
+	    fmt = @"";
 	}
+      format = [fmt cString];
+      formatLen = strlen(format);
       
       //
       // WARNING:
@@ -982,11 +985,11 @@ static inline int getDigits(const char *from, char *to, int limit)
 
 // Providing Adjusted Dates
 - (NSCalendarDate*) addYear: (int)year
-		      month: (unsigned int)month
-			day: (unsigned int)day
-		       hour: (unsigned int)hour
-		     minute: (unsigned int)minute
-		     second: (unsigned int)second
+		      month: (int)month
+			day: (int)day
+		       hour: (int)hour
+		     minute: (int)minute
+		     second: (int)second
 {
   return [self dateByAddingYears: year
 		          months: month