diff --git a/ChangeLog b/ChangeLog
index 107c6fd..fca5c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-29: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+	* EOAccess/EOEntity.m
+	  remove unused variable
+	* EOControl/EOEditingContext.m
+	  use the object, instead of the EOGlobalID to get the entityName
+	* EOControl/EOGenericRecord.m
+	* EOInterface/EOColumnAssociation.[h|m]
+	* EOInterface/EOTableViewAssociation.m
+	  some NS(U)Integer conversions
+	  
 2013-05-28: Graham Lee <iamleeg@gmail.com>
 	* Tools/gsdoc-model.m
 	* EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m
diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m
index 287d15b..6b4d595 100644
--- a/EOAccess/EOEntity.m
+++ b/EOAccess/EOEntity.m
@@ -1417,7 +1417,6 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
   NSString *key = nil;
   id value = nil;
   NSUInteger i, count;
-  BOOL isValid = YES;
   IMP pkanOAI=NULL;
   IMP objectVFK=NULL;
   
diff --git a/EOControl/EOEditingContext.m b/EOControl/EOEditingContext.m
index 82a0635..d5dc9d0 100644
--- a/EOControl/EOEditingContext.m
+++ b/EOControl/EOEditingContext.m
@@ -3458,7 +3458,7 @@ modified state of the object.**/
       else
 	{
 	  objectCopy = [[EOClassDescription classDescriptionForEntityName:
-					      [globalID entityName]]
+					      [object entityName]]
 			 createInstanceWithEditingContext: context
 			 globalID: globalID
 			 zone: NULL];
@@ -3606,7 +3606,7 @@ modified state of the object.**/
               gid=EOEditingContext_globalIDForObjectWithImpPtr(context,&globalIDForObjectIMP,object);
               
               localObject = [[EOClassDescription classDescriptionForEntityName:
-                                                   [gid entityName]]
+                                                   [object entityName]]
                               createInstanceWithEditingContext: context
                               globalID: gid
                               zone: NULL];
diff --git a/EOControl/EOKeyValueCoding.m b/EOControl/EOKeyValueCoding.m
index d5ba4f9..a8c8044 100644
--- a/EOControl/EOKeyValueCoding.m
+++ b/EOControl/EOKeyValueCoding.m
@@ -151,7 +151,7 @@ __attribute__((objc_root_class))
 {
   SEL		sel = 0;
   const char	*type = 0;
-  int		off;
+  int		off = 0;
   unsigned	size = [aKey length];
   id		self_id = self;
 
diff --git a/EOInterface/EOColumnAssociation.h b/EOInterface/EOColumnAssociation.h
index 406f8e4..fe3ac45 100644
--- a/EOInterface/EOColumnAssociation.h
+++ b/EOInterface/EOColumnAssociation.h
@@ -91,20 +91,20 @@
 - (void)tableView: (NSTableView *)tableView
    setObjectValue: (id)object
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row;
+	      row: (NSInteger)row;
 
 - (id)tableView: (NSTableView *)tableView
 objectValueForTableColumn: (NSTableColumn *)tableColumn
-	    row: (int)row;
+	    row: (NSInteger)row;
 
 - (BOOL)tableView: (NSTableView *)tableView
 shouldEditTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row;
+	      row: (NSInteger)row;
 
 - (void)tableView: (NSTableView *)tableView
   willDisplayCell: (id)cell
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row;
+	      row: (NSInteger)row;
 
 /* EOColumnViewAssociation control delegate.  */
 - (BOOL)control: (NSControl *)control
@@ -169,21 +169,21 @@ textShouldBeginEditing: (NSText *)fieldEditor;
 - (void)tableView: (NSTableView *)tableView
    setObjectValue: (id)object
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row;
+	      row: (NSInteger)row;
 
 - (id)tableView: (NSTableView *)tableView
 objectValueForTableColumn: (NSTableColumn *)tableColumn
-	    row: (int)row;
+	    row: (NSInteger)row;
 
 /* Delegate methods for table view.  */
 - (BOOL)tableView: (NSTableView *)tableView
 shouldEditTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row;
+	      row: (NSInteger)row;
 
 - (void)tableView: (NSTableView *)tableView
   willDisplayCell: (id)cell
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row;
+	      row: (NSInteger)row;
 
 /* Notification methods for table view.  */
 - (void)tableViewSelectionDidChange: (NSNotification *)notification;
diff --git a/EOInterface/EOColumnAssociation.m b/EOInterface/EOColumnAssociation.m
index 2c407c8..86e4473 100644
--- a/EOInterface/EOColumnAssociation.m
+++ b/EOInterface/EOColumnAssociation.m
@@ -135,7 +135,7 @@
   if (subclassFlags & ValueAspectMask)
     {
       NSTableView *tv = [[self object] tableView];
-      int row = tv ? [tv editedRow] : -1;
+      NSInteger row = tv ? [tv editedRow] : -1;
       
       if (row != -1)
         {
@@ -161,21 +161,21 @@
 - (void)tableView: (NSTableView *)tableView
    setObjectValue: (id)object
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row
+	      row: (NSInteger)row
 {
   [self setValue:object forAspect:@"value" atIndex:row];
 }
 
 - (id)tableView: (NSTableView *)tableView
 objectValueForTableColumn: (NSTableColumn *)tableColumn
-	    row: (int)row
+	    row: (NSInteger)row
 {
   return [self valueForAspect:@"value" atIndex:row];
 }
 
 - (BOOL)tableView: (NSTableView *)tableView
 shouldEditTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row
+	      row: (NSInteger)row
 {
   if (_enabledAspectBound)
     return [[self valueForAspect:@"enabled"] boolValue];
@@ -186,7 +186,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
 - (void)tableView: (NSTableView *)tableView
   willDisplayCell: (id)cell
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row
+	      row: (NSInteger)row
 {
   if (_enabledAspectBound)
     [cell setEnabled:[[self valueForAspect:@"value" atIndex:row] boolValue]];
diff --git a/EOInterface/EOTableViewAssociation.m b/EOInterface/EOTableViewAssociation.m
index a116fa9..c2765a0 100644
--- a/EOInterface/EOTableViewAssociation.m
+++ b/EOInterface/EOTableViewAssociation.m
@@ -149,13 +149,13 @@ static NSMapTable *tvAssociationMap;
       if (!_extras)
         {
           NSArray *selectionIndexes = RETAIN([dg selectionIndexes]);
-          unsigned int i, count;
+          NSUInteger i, count;
           count = [selectionIndexes count];
           if (count)
     	    {
               for (i = 0; i < count; i++)
                 {
-	          int rowIndex = [[selectionIndexes objectAtIndex:i] intValue];
+	          NSInteger rowIndex = [[selectionIndexes objectAtIndex:i] integerValue];
 		  
 		  /* don't extend the first selection */
 	          [[self object] selectRow: rowIndex
@@ -229,7 +229,7 @@ static NSMapTable *tvAssociationMap;
 
 - (EOColumnAssociation *)editingAssociation
 {
-  int editedColumn = [[self object] editedColumn];
+  NSInteger editedColumn = [[self object] editedColumn];
 
   if (editedColumn == -1)
     {
@@ -249,7 +249,7 @@ static NSMapTable *tvAssociationMap;
 - (void)tableView: (NSTableView *)tableView
    setObjectValue: (id)object
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row
+	      row: (NSInteger)row
 {
   [(EOColumnAssociation *)[tableColumn identifier] 
   			    tableView: tableView
@@ -260,7 +260,7 @@ static NSMapTable *tvAssociationMap;
 
 - (id)tableView: (NSTableView *)tableView
 objectValueForTableColumn: (NSTableColumn *)tableColumn
-	    row: (int)row
+	    row: (NSInteger)row
 {
   id object;
   object = [[tableColumn identifier] tableView: tableView 
@@ -271,7 +271,7 @@ objectValueForTableColumn: (NSTableColumn *)tableColumn
 
 - (BOOL)tableView: (NSTableView *)tableView
 shouldEditTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row
+	      row: (NSInteger)row
 {
   if (_enabledAspectBound)
     if ([[self valueForAspect: @"enabled" atIndex:row] boolValue] == NO) 
@@ -283,7 +283,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
 - (void)tableView: (NSTableView *)tableView
   willDisplayCell: (id)cell
    forTableColumn: (NSTableColumn *)tableColumn
-	      row: (int)row
+	      row: (NSInteger)row
 {
   if (_enabledAspectBound)
     [cell setEnabled: [[self valueForAspect:@"enabled" atIndex: row] boolValue]];