diff --git a/ChangeLog b/ChangeLog
index 8d1896a3f..276b8aa86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-15  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSParagraphStyle.m:
+	* Source/NSPopUpButton.m:
+	* Source/NSMenuItemCell.m:
+	* Source/NSFont.m: Fix more unsigned int / ints that should
+	be NSUInteger/NSInteger
+
 2010-09-15  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/GSTextStorage.m: Fix an unisgned->NSUInteger
diff --git a/Source/NSFont.m b/Source/NSFont.m
index b62f5e90e..f4ff50189 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -79,7 +79,7 @@ globalFontMap.
 }
 @end
 @implementation GSFontMapKey
--(unsigned int) hash
+-(NSUInteger) hash
 {
   return hash;
 }
@@ -935,7 +935,7 @@ static void setNSFont(NSString *key, NSFont *font)
   return YES;
 }
 
-- (unsigned) hash
+- (NSUInteger) hash
 {
   int i, sum;
   sum = 0;
diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m
index 129418236..e3f387838 100644
--- a/Source/NSMenuItemCell.m
+++ b/Source/NSMenuItemCell.m
@@ -160,7 +160,7 @@
   return _menuItem;
 }
 
-- (int) tag
+- (NSInteger) tag
 {
   return [[self menuItem] tag];
 }
diff --git a/Source/NSParagraphStyle.m b/Source/NSParagraphStyle.m
index 45e187500..8925d85be 100644
--- a/Source/NSParagraphStyle.m
+++ b/Source/NSParagraphStyle.m
@@ -139,7 +139,7 @@
     return NSOrderedSame;
 }
 
-- (unsigned) hash
+- (NSUInteger) hash
 {
   unsigned val = (unsigned)_location;
 
@@ -601,7 +601,7 @@ static NSParagraphStyle	*defaultStyle = nil;
   return [_tabStops isEqualToArray: other->_tabStops];
 }
 
-- (unsigned int) hash
+- (NSUInteger) hash
 {
   return _alignment + _lineBreakMode;
 }
diff --git a/Source/NSPopUpButton.m b/Source/NSPopUpButton.m
index 4c110c9b4..ccc1914fc 100644
--- a/Source/NSPopUpButton.m
+++ b/Source/NSPopUpButton.m
@@ -257,7 +257,7 @@ this to return nil to indicate that we have no context menu.
 /**<p>Returns the tag of the selected item</p>
    <p>See Also: [NSPopUpButtonCell-indexOfSelectedItem]</p>
 */
-- (int) selectedTag
+- (NSInteger) selectedTag
 {
   return [[_cell selectedItem] tag];
 }