diff --git a/Source/GSString.m b/Source/GSString.m
index 285b21c09..84ef54b52 100644
--- a/Source/GSString.m
+++ b/Source/GSString.m
@@ -817,6 +817,10 @@ static void logTinyStringCount(void)
 {
   return self;
 }
+- (NSUInteger) retainCount
+{
+  return UINT_MAX;
+}
 
 - (id) autorelease
 {
diff --git a/Source/NSNumber.m b/Source/NSNumber.m
index c6cf50fc6..d5e16193a 100644
--- a/Source/NSNumber.m
+++ b/Source/NSNumber.m
@@ -402,6 +402,11 @@ static BOOL useSmallFloat;
   return self;
 }
 
+- (NSUInteger) retainCount
+{
+  return UINT_MAX;
+}
+
 - (id) autorelease
 {
   return self;
@@ -510,6 +515,11 @@ load
   return self;
 }
 
+- (NSUInteger) retainCount
+{
+  return UINT_MAX;
+}
+
 - (id) autorelease
 {
   return self;
@@ -561,6 +571,11 @@ load
   return self;
 }
 
+- (NSUInteger) retainCount
+{
+  return UINT_MAX;
+}
+
 - (id) autorelease
 {
   return self;
@@ -804,7 +819,7 @@ if (aValue >= -1 && aValue <= 12)\
       (aValue < (INT_MAX>>OBJC_SMALL_OBJECT_SHIFT)) &&
       (aValue > -(INT_MAX>>OBJC_SMALL_OBJECT_SHIFT)))
     {
-       return (id)((aValue << OBJC_SMALL_OBJECT_SHIFT) | SMALL_INT_MASK);
+       return (id)((((NSInteger)aValue) << OBJC_SMALL_OBJECT_SHIFT) | SMALL_INT_MASK);
     }
 #endif
   n = NSAllocateObject (NSIntNumberClass, 0, 0);