diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index 613ac4afa..8c895785a 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -1690,11 +1690,11 @@ andAttribute: (EOAttribute *)_attribute
 
   if ([GCSFolderManager singleStoreMode])
     sqlString = [NSMutableString stringWithFormat:
-                                   @"SELECT COUNT(*) AS CNT FROM %@ WHERE c_folder_id = %@",
+                                   @"SELECT COUNT(*) AS cnt FROM %@ WHERE c_folder_id = %@",
                                  [self storeTableName], folderId];
   else
     sqlString = [NSMutableString stringWithFormat:
-                                   @"SELECT COUNT(*) AS CNT FROM %@",
+                                   @"SELECT COUNT(*) AS cnt FROM %@",
                                  [self storeTableName]];
   if (excludeDeleted)
     {
@@ -1715,7 +1715,7 @@ andAttribute: (EOAttribute *)_attribute
 	{
 	  attrs = [channel describeResults: NO];
 	  row = [channel fetchAttributes: attrs withZone: NULL];
-	  count = [[row objectForKey: @"CNT"] unsignedIntValue];
+	  count = [[row objectForKey: @"cnt"] unsignedIntValue];
 	  [channel cancelFetch];
 	}
       [self releaseChannel: channel];
@@ -1744,12 +1744,12 @@ andAttribute: (EOAttribute *)_attribute
 
   if ([GCSFolderManager singleStoreMode])
     sqlString = [NSMutableString stringWithFormat:
-                                   @"SELECT COUNT(*) AS CNT FROM %@"
+                                   @"SELECT COUNT(*) AS cnt FROM %@"
                                  @" WHERE c_folder_id = %@ AND c_lastmodified < %u AND c_deleted = 1",
                                  [self storeTableName], folderId, delta];
   else
     sqlString = [NSMutableString stringWithFormat:
-                                   @"SELECT COUNT(*) AS CNT FROM %@"
+                                   @"SELECT COUNT(*) AS cnt FROM %@"
                                  @" WHERE c_lastmodified < %u AND c_deleted = 1",
                                  [self storeTableName], delta];
 
@@ -1764,7 +1764,7 @@ andAttribute: (EOAttribute *)_attribute
 	{
 	  attrs = [channel describeResults: NO];
 	  row = [channel fetchAttributes: attrs withZone: NULL];
-	  count = [[row objectForKey: @"CNT"] unsignedIntValue];
+	  count = [[row objectForKey: @"cnt"] unsignedIntValue];
 	  [channel cancelFetch];
 	}
       [self releaseChannel: channel];
diff --git a/Tools/SOGoToolBackup.m b/Tools/SOGoToolBackup.m
index a2e714768..d352761db 100644
--- a/Tools/SOGoToolBackup.m
+++ b/Tools/SOGoToolBackup.m
@@ -137,7 +137,6 @@
   int count, max;
 
   lm = [SOGoUserManager sharedUserManager];
-  pool = [[NSAutoreleasePool alloc] init];
 
   max = [users count];
   user = [users objectAtIndex: 0];
@@ -173,9 +172,11 @@
 
 	  users = allSqlUsers;
 	  max = [users count];
+          [allSqlUsers autorelease];
 	}
     }
 
+  pool = [[NSAutoreleasePool alloc] init];
   allUsers = [NSMutableArray new];
   for (count = 0; count < max; count++)
     {
diff --git a/Tools/SOGoToolCleanupUser.m b/Tools/SOGoToolCleanupUser.m
index 41e6127f5..55bfc27a2 100644
--- a/Tools/SOGoToolCleanupUser.m
+++ b/Tools/SOGoToolCleanupUser.m
@@ -92,7 +92,6 @@
   int count, max;
 
   lm = [SOGoUserManager sharedUserManager];
-  pool = [[NSAutoreleasePool alloc] init];
 
   max = [users count];
   user = [users objectAtIndex: 0];
@@ -127,9 +126,11 @@
 
 	  users = allSqlUsers;
 	  max = [users count];
+          [allSqlUsers autorelease];
 	}
     }
 
+  pool = [[NSAutoreleasePool alloc] init];
   allUsers = [NSMutableArray new];
   for (count = 0; count < max; count++)
     {