diff --git a/ChangeLog b/ChangeLog
index 7e1c4400c..3d23ab909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-20 18:25 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibCompatibility.m
+	* Source/NSButtonCell.m: Merged additional changes from 
+	NibCompatibility.
+
 2006-05-20 18:11 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* ChangeLog
diff --git a/Source/GSNibCompatibility.m b/Source/GSNibCompatibility.m
index fbb30e299..d592a7650 100644
--- a/Source/GSNibCompatibility.m
+++ b/Source/GSNibCompatibility.m
@@ -48,6 +48,7 @@
 #include <Foundation/NSKeyedArchiver.h>
 #include "AppKit/AppKit.h"
 #include <GNUstepBase/GSObjCRuntime.h>
+#include <GNUstepBase/GSIArray.h>
 #include <GNUstepGUI/GSNibCompatibility.h>
 #include <GNUstepGUI/GSInstantiator.h>
 
@@ -687,6 +688,28 @@
 - (BOOL) replaceObject: (id)oldObj withObject: (id)newObj;
 @end
 
+@implementation NSKeyedUnarchiver (NSClassSwapperPrivate)
+- (BOOL) replaceObject: (id)oldObj withObject: (id)newObj
+{
+  unsigned int i = 0;
+  unsigned int count = GSIArrayCount(_objMap);
+  for(i = 0; i < count; i++)
+    {
+      id obj = GSIArrayItemAtIndex(_objMap, i).obj;
+      if(obj == oldObj)
+	break;
+    }
+
+  if(i < count)
+    {
+      GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)newObj, i);
+      return YES;
+    }
+
+  return NO;
+}
+@end
+
 @implementation NSClassSwapper
 - (void) setTemplate: (id)temp
 {
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index a0fdb9f51..4c866ecc6 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -75,8 +75,7 @@ typedef struct _GSButtonCellFlags
   unsigned int hasKeyEquiv:1;
   unsigned int lastState:1;
   unsigned int isTransparent:1;
-  unsigned int inset:2
-  unsigned int unused2:4; // doesn't dim:1 gradient:3
+  unsigned int unused2:6; // inset:2 doesn't dim:1 gradient:3
   unsigned int useButtonImageSource:1;
   unsigned int unused3:8; // alt mnemonic loc.
 #else