diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index f7d868350..55ec998f4 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* iCalPerson.m ([-rsvp]): return lowercase string.
+
+	* iCalCalendar.m ([iCalCalendar -setMethod:_value]): convert
+	method to uppercase before setting value.
+
 	* CardGroup.m ([CardGroup -addChild:aChild]): don't process nil
 	values for aChild.
 	([CardGroup -setUniqueChild:aChild]): same as above.
diff --git a/SOPE/NGCards/iCalCalendar.m b/SOPE/NGCards/iCalCalendar.m
index 060509ee8..b478b7f91 100644
--- a/SOPE/NGCards/iCalCalendar.m
+++ b/SOPE/NGCards/iCalCalendar.m
@@ -101,7 +101,8 @@
 
 - (void) setMethod: (NSString *) _value
 {
-  [[self uniqueChildWithTag: @"method"] setValue: 0 to: _value];
+  [[self uniqueChildWithTag: @"method"] setValue: 0
+					to: [_value uppercaseString]];
 }
 
 - (NSString *) method
diff --git a/SOPE/NGCards/iCalEventChanges.m b/SOPE/NGCards/iCalEventChanges.m
index 4105c1801..045e8ca0e 100644
--- a/SOPE/NGCards/iCalEventChanges.m
+++ b/SOPE/NGCards/iCalEventChanges.m
@@ -41,13 +41,13 @@
 - (id)initWithFromEvent:(iCalEvent *)_from toEvent:(iCalEvent *)_to {
   self = [super init];
   if(self) {
-    self->insertedAttendees = [[NSMutableArray alloc] init];
-    self->deletedAttendees  = [[NSMutableArray alloc] init];
-    self->updatedAttendees  = [[NSMutableArray alloc] init];
-    self->insertedAlarms    = [[NSMutableArray alloc] init];
-    self->deletedAlarms     = [[NSMutableArray alloc] init];
-    self->updatedAlarms     = [[NSMutableArray alloc] init];
-    self->updatedProperties = [[NSMutableArray alloc] init];
+    insertedAttendees = [NSMutableArray new];
+    deletedAttendees  = [NSMutableArray new];
+    updatedAttendees  = [NSMutableArray new];
+    insertedAlarms    = [NSMutableArray new];
+    deletedAlarms     = [NSMutableArray new];
+    updatedAlarms     = [NSMutableArray new];
+    updatedProperties = [NSMutableArray new];
     [self _trackAttendeeChanges:_from :_to];
     [self _trackPropertyChanges:_from :_to];
   }
@@ -55,13 +55,13 @@
 }
 
 - (void)dealloc {
-  [self->insertedAttendees release];
-  [self->deletedAttendees  release];
-  [self->updatedAttendees  release];
-  [self->insertedAlarms    release];
-  [self->deletedAlarms     release];
-  [self->updatedAlarms     release];
-  [self->updatedProperties release];
+  [insertedAttendees release];
+  [deletedAttendees  release];
+  [updatedAttendees  release];
+  [insertedAlarms    release];
+  [deletedAlarms     release];
+  [updatedAlarms     release];
+  [updatedProperties release];
   [super dealloc];
 }
 
@@ -86,13 +86,13 @@
       if([fp hasSameEmailAddress:tp]) {
         found = YES;
         if(![fp isEqualToPerson:tp]) {
-          [self->updatedAttendees addObject:tp];
+          [updatedAttendees addObject:tp];
         }
         break;
       }
     }
     if(!found) {
-      [self->deletedAttendees addObject:fp];
+      [deletedAttendees addObject:fp];
     }
   }
   for(t = 0; t < tcount; t++) {
@@ -110,7 +110,7 @@
       }
     }
     if(!found)
-      [self->insertedAttendees addObject:tp];
+      [insertedAttendees addObject:tp];
   }
 }
 
@@ -119,31 +119,31 @@
 
 - (void)_trackPropertyChanges:(iCalEvent *)_from :(iCalEvent *)_to {
   if(!IS_EQUAL([_from startDate], [_to startDate], isEqualToDate:))
-    [self->updatedProperties addObject:@"startDate"];
+    [updatedProperties addObject:@"startDate"];
   if(!IS_EQUAL([_from endDate], [_to endDate], isEqualToDate:))
-    [self->updatedProperties addObject:@"endDate"];
+    [updatedProperties addObject:@"endDate"];
   if(!IS_EQUAL([_from created], [_to created], isEqualToDate:))
-    [self->updatedProperties addObject:@"created"];
+    [updatedProperties addObject:@"created"];
   if(!IS_EQUAL([_from lastModified], [_to lastModified], isEqualToDate:))
-    [self->updatedProperties addObject:@"lastModified"];
+    [updatedProperties addObject:@"lastModified"];
   if(![_from durationAsTimeInterval] == [_to durationAsTimeInterval])
-    [self->updatedProperties addObject:@"duration"];
+    [updatedProperties addObject:@"duration"];
   if(!IS_EQUAL([_from summary], [_to summary], isEqualToString:))
-    [self->updatedProperties addObject:@"summary"];
+    [updatedProperties addObject:@"summary"];
   if(!IS_EQUAL([_from location], [_to location], isEqualToString:))
-    [self->updatedProperties addObject:@"location"];
+    [updatedProperties addObject:@"location"];
   if(!IS_EQUAL([_from comment], [_to comment], isEqualToString:))
-    [self->updatedProperties addObject:@"comment"];
+    [updatedProperties addObject:@"comment"];
   if(!IS_EQUAL([_from priority], [_to priority], isEqualToString:))
-    [self->updatedProperties addObject:@"priority"];
+    [updatedProperties addObject:@"priority"];
   if(!IS_EQUAL([_from status], [_to status], isEqualToString:))
-    [self->updatedProperties addObject:@"status"];
+    [updatedProperties addObject:@"status"];
   if(!IS_EQUAL([_from accessClass], [_to accessClass], isEqualToString:))
-    [self->updatedProperties addObject:@"accessClass"];
+    [updatedProperties addObject:@"accessClass"];
   if(!IS_EQUAL([_from sequence], [_to sequence], isEqualToNumber:))
-    [self->updatedProperties addObject:@"sequence"];
+    [updatedProperties addObject:@"sequence"];
   if(!IS_EQUAL([_from organizer], [_to organizer], isEqual:))
-    [self->updatedProperties addObject:@"organizer"];
+    [updatedProperties addObject:@"organizer"];
 }
 
 - (BOOL)hasChanges {
@@ -169,27 +169,27 @@
 }
 
 - (NSArray *)insertedAttendees {
-  return self->insertedAttendees;
+  return insertedAttendees;
 }
 - (NSArray *)deletedAttendees {
-  return self->deletedAttendees;
+  return deletedAttendees;
 }
 - (NSArray *)updatedAttendees {
-  return self->updatedAttendees;
+  return updatedAttendees;
 }
 
 - (NSArray *)insertedAlarms {
-  return self->insertedAlarms;
+  return insertedAlarms;
 }
 - (NSArray *)deletedAlarms {
-  return self->deletedAlarms;
+  return deletedAlarms;
 }
 - (NSArray *)updatedAlarms {
-  return self->updatedAlarms;
+  return updatedAlarms;
 }
 
 - (NSArray *)updatedProperties {
-  return self->updatedProperties;
+  return updatedProperties;
 }
 
 /* descriptions */
@@ -200,10 +200,10 @@
   ms = [NSMutableString stringWithCapacity:128];
   [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
   
-  [ms appendFormat:@" updatedProperties=%@", self->updatedProperties];
-  [ms appendFormat:@" insertedAttendees=%@", self->insertedAttendees];
-  [ms appendFormat:@" deletedAttendees=%@", self->deletedAttendees];
-  [ms appendFormat:@" updatedAttendees=%@", self->updatedAttendees];
+  [ms appendFormat:@" updatedProperties=%@", updatedProperties];
+  [ms appendFormat:@" insertedAttendees=%@", insertedAttendees];
+  [ms appendFormat:@" deletedAttendees=%@", deletedAttendees];
+  [ms appendFormat:@" updatedAttendees=%@", updatedAttendees];
   
   [ms appendString:@">"];
   return ms;
diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index 68e3deef5..11b76507a 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -85,7 +85,7 @@
 
 - (NSString *) rsvp
 {
-  return [self value: 0 ofAttribute: @"rsvp"];
+  return [[self value: 0 ofAttribute: @"rsvp"] lowercaseString];
 }
 
 // - (void)setXuid:(NSString *)_s {