diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index 7904fd0f8..97a1bf527 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -267,7 +267,7 @@
 - (BOOL)isEqual:(id)_other {
   if(_other == nil)
     return NO;
-  if([_other class] != self->isa)
+  if([_other class] != object_getClass(self))
     return NO;
   if([_other hash] != [self hash])
     return NO;
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index 422f34d92..6aad3e625 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -697,7 +697,7 @@
   BOOL otherIsPersonal;
 
   otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
-                     || ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
+                     || ([otherFolder isKindOfClass: object_getClass(self)] && [otherFolder isPersonalSource]));
 
   if (isPersonalSource)
     {
diff --git a/SoObjects/SOGo/SOGoCacheGCSFolder.m b/SoObjects/SOGo/SOGoCacheGCSFolder.m
index b29287fcb..2e483bc32 100644
--- a/SoObjects/SOGo/SOGoCacheGCSFolder.m
+++ b/SoObjects/SOGo/SOGoCacheGCSFolder.m
@@ -364,7 +364,7 @@ Class SOGoCacheGCSObjectK = Nil;
   if (record)
     {
       if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
-        objectClass = isa;
+        objectClass = object_getClass(self);
       else
         objectClass = SOGoCacheGCSObjectK;
 
diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m
index aa881b9d3..2e117f54d 100644
--- a/SoObjects/SOGo/SQLSource.m
+++ b/SoObjects/SOGo/SQLSource.m
@@ -880,7 +880,7 @@
 
   reason = [NSString stringWithFormat: @"method '%@' is not available"
                      @" for class '%@'", NSStringFromSelector (_cmd),
-                     NSStringFromClass (isa)];
+                     NSStringFromClass (object_getClass(self))];
 
   return [NSException exceptionWithName: @"SQLSourceIOException"
                                  reason: reason
@@ -893,7 +893,7 @@
 
   reason = [NSString stringWithFormat: @"method '%@' is not available"
                      @" for class '%@'", NSStringFromSelector (_cmd),
-                     NSStringFromClass (isa)];
+                     NSStringFromClass (object_getClass(self))];
 
   return [NSException exceptionWithName: @"SQLSourceIOException"
                                  reason: reason
@@ -906,7 +906,7 @@
 
   reason = [NSString stringWithFormat: @"method '%@' is not available"
                      @" for class '%@'", NSStringFromSelector (_cmd),
-                     NSStringFromClass (isa)];
+                     NSStringFromClass (object_getClass(self))];
 
   return [NSException exceptionWithName: @"SQLSourceIOException"
                                  reason: reason
@@ -932,7 +932,7 @@
 
   reason = [NSString stringWithFormat: @"method '%@' is not available"
                      @" for class '%@'", NSStringFromSelector (_cmd),
-                     NSStringFromClass (isa)];
+                     NSStringFromClass (object_getClass(self))];
 
   return [NSException exceptionWithName: @"SQLSourceIOException"
                                  reason: reason
@@ -947,7 +947,7 @@
 
   reason = [NSString stringWithFormat: @"method '%@' is not available"
                      @" for class '%@'", NSStringFromSelector (_cmd),
-                     NSStringFromClass (isa)];
+                     NSStringFromClass (object_getClass(self))];
 
   return [NSException exceptionWithName: @"SQLSourceIOException"
                                  reason: reason
@@ -961,7 +961,7 @@
 
   reason = [NSString stringWithFormat: @"method '%@' is not available"
                      @" for class '%@'", NSStringFromSelector (_cmd),
-                     NSStringFromClass (isa)];
+                     NSStringFromClass (object_getClass(self))];
 
   return [NSException exceptionWithName: @"SQLSourceIOException"
                                  reason: reason