diff --git a/ANNOUNCE b/ANNOUNCE
index bf2a1d0..22eef40 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-The GNUstep Database Library 2 Package, version 0.12.0 is now available.
+The GNUstep Database Library 2 Package, version 0.12.1 is now available.
 
 What is the GNUstep Database Library 2 Package?
 ====================================
@@ -22,6 +22,12 @@ Debian Etch/x86
 Debian Lenny/x86
 CentOS 5.2/x68_64
 
+Changes in version 0.12.1
+=========================
+This release contains the following changes:
+- Fix minor memory management bugs in DBModeler.
+- Adapt NSUndoManager handling to new behavior.
+
 Changes in version 0.12.0
 =========================
 This release contains the following changes:
@@ -31,31 +37,10 @@ This release contains the following changes:
 - improved make 2.0 integration
 - minor bug fixes
 
-Changes in version 0.11.0
-=========================
-This release contains the following changes:
-- Build as NATIVE_LIBRARY and renamed projects to
-  (lib)EOControl, (lib)EOAccess and (lib)EOInterface
-- Adaption to the gnustep-make 2.0 infrastructure
-- Addition of an SQLiteAdaptor.
-- Removed dependency on GC classes.
-- Started update of the Postgres95->PostgreSQL adaptor
-  (The goal is to migrate to the PostgreSQL 7/8 API and datatypes
-   but this is still WIP.)
-- Much improved DBModeler application including initial diagram support.
-- Much improved GDL2Palette support.
-- Improved EODisplayGroup implementation.
-
-- Bug fixes
-  - Correct propagation or relationship attributes.
-  - Correct determination of seconds and milliseconds in the
-    PostgreSQL adaptor
-
-
 Where can you get it?  How can you compile it?
 ==============================================
 
-The gnustep-dl2-0.11.0.tar.gz distribution file has been placed at
+The gnustep-dl2-0.12.1.tar.gz distribution file has been placed at
 <http://ftp.gnustep.org/pub/gnustep/libs>
 
 Please log bug reports on the GNUstep project page
diff --git a/ChangeLog b/ChangeLog
index e3af680..0a255b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-14  David Ayers  <ayers@fsfe.org>
+
+	* EOMutableKnownKeyDictionary.h/m ([-initWithObjects:forKeys:count:]):
+	* EOFault.h/m ([-retainCount]):
+	* EOKeyGlobalID.h/m ([-hash]):
+	* EOMultiReaderLock.m ([-tryLockForReading]):
+	* EOCheapArray.h/m ([-initWithObjects:count:],[initWithCapacity:]):
+	* EOGlobalID.h/m ([-hash]): Use NS(U)Integer instead of int.
+	
 2010-04-09  David Ayers  <ayers@fsfe.org>
 
 	* EOControl/EONSAddOns.h (GDL2_ActivateAllGDL2Categories):
diff --git a/EOControl/EOCheapArray.h b/EOControl/EOCheapArray.h
index 455eb25..bf5f927 100644
--- a/EOControl/EOCheapArray.h
+++ b/EOControl/EOCheapArray.h
@@ -45,7 +45,7 @@
 
 - (id)initWithArray: (NSArray *)array;
 - (id)initWithObjects: (id *)objects
-		count: (unsigned int)count;
+		count: (NSUInteger)count;
 - (void)release;
 - (unsigned int)retainCount;
 - (id)retain;
@@ -66,9 +66,9 @@
   id _immutableCopy;
 }
 
-- (id)initWithCapacity: (unsigned int)capacity;
+- (id)initWithCapacity: (NSUInteger)capacity;
 - (id)initWithObjects: (id *)objects
-		count: (unsigned int)count;
+		count: (NSUInteger)count;
 - (id)initWithArray: (NSArray *)array;
 - (void)dealloc;
 - (NSArray *)shallowCopy;
diff --git a/EOControl/EOCheapArray.m b/EOControl/EOCheapArray.m
index 8002274..f71dfc6 100644
--- a/EOControl/EOCheapArray.m
+++ b/EOControl/EOCheapArray.m
@@ -81,7 +81,7 @@ RCS_ID("$Id$")
 }
 
 - (id) initWithObjects: (id*)objects
-                 count: (unsigned int)count
+                 count: (NSUInteger)count
 {
 #ifdef DEBUG
   NSDebugFLog(@"initWithObjects EOCheapCopyArray %p", 
@@ -206,7 +206,7 @@ RCS_ID("$Id$")
 
 @implementation EOCheapCopyMutableArray
 
-- (id) initWithCapacity: (unsigned int)capacity
+- (id) initWithCapacity: (NSUInteger)capacity
 {
   if (capacity == 0)
     {
@@ -221,7 +221,7 @@ RCS_ID("$Id$")
 }
 
 - (id) initWithObjects: (id*)objects
-                 count: (unsigned int)count
+                 count: (NSUInteger)count
 {
   self = [self initWithCapacity: count];
 
diff --git a/EOControl/EOEditingContext.m b/EOControl/EOEditingContext.m
index e7fa76b..f86078a 100644
--- a/EOControl/EOEditingContext.m
+++ b/EOControl/EOEditingContext.m
@@ -1518,15 +1518,7 @@ _mergeValueForKey(id obj, id value,
   /* TODO Figure out when checkpoint notifications should cause the
      editing context to process changes */
 
-  /* In WO45 the NSUndoManager did not send a
-     NSUndoManagerCheckpointNotification upon beginning an
-     undo grouping.  Current incarnations of GNUStep/Cocoa do.
-     There for we guard against processing end of event during
-     the beginning if an undo group here.  */
-  if ([_undoManager groupingLevel] > 0)
-    {
-      [self _processEndOfEventNotification: notification];
-    }
+  [self _processEndOfEventNotification: notification];
 }
 
 - (BOOL) _processRecentChanges
diff --git a/EOControl/EOFault.h b/EOControl/EOFault.h
index d3c1b16..5319b05 100644
--- a/EOControl/EOFault.h
+++ b/EOControl/EOFault.h
@@ -95,7 +95,7 @@
 - (id)retain;
 - (void)release;
 - (id)autorelease;
-- (unsigned)retainCount;
+- (NSUInteger)retainCount;
 
 - (NSString *)description;
 - (NSString *)descriptionWithIndent: (unsigned)level;
diff --git a/EOControl/EOFault.m b/EOControl/EOFault.m
index c986227..6097535 100644
--- a/EOControl/EOFault.m
+++ b/EOControl/EOFault.m
@@ -388,7 +388,7 @@ static Class EOFaultClass = NULL;
   return self;
 }
 
-- (unsigned)retainCount
+- (NSUInteger)retainCount
 {
   return [_handler extraRefCount];
 }
diff --git a/EOControl/EOGlobalID.h b/EOControl/EOGlobalID.h
index 3fdb119..c63dd7a 100644
--- a/EOControl/EOGlobalID.h
+++ b/EOControl/EOGlobalID.h
@@ -50,7 +50,7 @@ GDL2CONTROL_EXPORT NSString *EOGlobalIDChangedNotification;
 @interface EOGlobalID : NSObject <NSCopying>
 
 - (BOOL)isEqual: (id)other;
-- (unsigned)hash;
+- (NSUInteger)hash;
 
 - (BOOL)isTemporary;
 
diff --git a/EOControl/EOGlobalID.m b/EOControl/EOGlobalID.m
index b890b7f..d642d04 100644
--- a/EOControl/EOGlobalID.m
+++ b/EOControl/EOGlobalID.m
@@ -77,7 +77,7 @@ NSString *EOGlobalIDChangedNotification = @"EOGlobalIDChangedNotification";
   return NO;
 }
 
-- (unsigned)hash
+- (NSUInteger)hash
 {
   return 0;
 }
diff --git a/EOControl/EOKeyGlobalID.h b/EOControl/EOKeyGlobalID.h
index cb709d8..7be3c5b 100644
--- a/EOControl/EOKeyGlobalID.h
+++ b/EOControl/EOKeyGlobalID.h
@@ -50,7 +50,7 @@
 - (NSArray *)keyValuesArray;
 
 - (BOOL)isEqual: (id)other;
-- (unsigned)hash;
+- (NSUInteger)hash;
 
 - (BOOL)isFinal;
 - (NSString *)description;
diff --git a/EOControl/EOKeyGlobalID.m b/EOControl/EOKeyGlobalID.m
index 504e458..1020c30 100644
--- a/EOControl/EOKeyGlobalID.m
+++ b/EOControl/EOKeyGlobalID.m
@@ -155,7 +155,7 @@ RCS_ID("$Id$")
 }
 
 
-- (unsigned int)hash
+- (NSUInteger)hash
 {
   int i;
   unsigned int hash = 0;
diff --git a/EOControl/EOKeyValueQualifier.m b/EOControl/EOKeyValueQualifier.m
index 7358b4a..de9b15f 100644
--- a/EOControl/EOKeyValueQualifier.m
+++ b/EOControl/EOKeyValueQualifier.m
@@ -39,6 +39,7 @@
 RCS_ID("$Id$")
 
 #ifdef GNUSTEP
+#include <Foundation/NSArray.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSSet.h>
diff --git a/EOControl/EOMultiReaderLock.m b/EOControl/EOMultiReaderLock.m
index 06f9b57..5b59650 100644
--- a/EOControl/EOMultiReaderLock.m
+++ b/EOControl/EOMultiReaderLock.m
@@ -81,7 +81,7 @@
 - (BOOL)tryLockForReading
 {
   NSThread *ct = [NSThread currentThread];
-  int cnt = (int)NSMapGet(_readerThreads,ct);
+  NSInteger cnt = (NSInteger)NSMapGet(_readerThreads,ct);
   BOOL flag;
 
   if (ct == _writerLockThread)
diff --git a/EOControl/EOMutableKnownKeyDictionary.h b/EOControl/EOMutableKnownKeyDictionary.h
index ac7de7d..8f9da82 100644
--- a/EOControl/EOMutableKnownKeyDictionary.h
+++ b/EOControl/EOMutableKnownKeyDictionary.h
@@ -154,7 +154,7 @@
 		  objects: (id *)objects;
 - (id)initWithObjects: (id *)objects
 	      forKeys: (id *)keys
-		count: (unsigned int)count;
+		count: (NSUInteger)count;
 - (unsigned int)count;
 - (id)objectForKey: (id)key;
 - (void)setObject: (id)object
diff --git a/EOControl/EOMutableKnownKeyDictionary.m b/EOControl/EOMutableKnownKeyDictionary.m
index 3102778..58bb7d6 100644
--- a/EOControl/EOMutableKnownKeyDictionary.m
+++ b/EOControl/EOMutableKnownKeyDictionary.m
@@ -751,7 +751,7 @@ RCS_ID("$Id$")
 // This is the designated initializer
 - (id) initWithObjects: (id*)objects
                forKeys: (id*)keys
-                 count: (unsigned int)count
+                 count: (NSUInteger)count
 {
   //OK
   EOMKKDInitializer *initializer = nil;
diff --git a/NEWS b/NEWS
index 82d7c75..40acef6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
 News
 ****
 
+The currently released version of the library is `0.12.1'.
+
+'alpha' release 0.12.1
+========================================
+This release contains the following changes:
+- Fix minor memory management bugs in DBModeler.
+- Adapt NSUndoManager handling to new behavior.
+
 The currently released version of the library is `0.12.0'.
 
 'alpha' release 0.12.0
diff --git a/README b/README
index 4562d7b..4f22824 100644
--- a/README
+++ b/README
@@ -62,7 +62,7 @@ the model objects.
  
 The Trading framework, provides an example model, and some routines to
 create a database from the model, and populate the database with data,
-while not an example itself it is indented for use by example applications 
+while not an example itself it is intended for use by example applications 
 using GDL2 alone, EOInterface or GSWeb, and for higher level tests.
 
 - Using GDL2 in other Projects
diff --git a/Version b/Version
index 30b50be..cc4b983 100644
--- a/Version
+++ b/Version
@@ -7,7 +7,7 @@ GNUSTEP_GCC=2.95.2
 # The version number of this release.
 MAJOR_VERSION=0
 MINOR_VERSION=12
-SUBMINOR_VERSION=0
+SUBMINOR_VERSION=1
 GDL2_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
 VERSION=${GDL2_VERSION}