diff --git a/ChangeLog b/ChangeLog
index 11d479ab4..563148c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-16 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSButtonCell.m (-setImage:): Call super implementation to
+	make sure the button gets redrawn.
+	* Source/NSWindow.m (-setContentView:): Don't do anything when
+	setting the same view again.
+
 2008-12-16 13:58-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSNibLoading.m: Make the log ino debug in awakeFromNib 
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 37b4b59a5..15d4bb554 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -433,18 +433,12 @@ typedef struct _GSButtonCellFlags
 
 - (void) setImage: (NSImage *)anImage
 {
-  if (anImage) 
-    {
-      NSAssert ([anImage isKindOfClass: [NSImage class]],
-                NSInvalidArgumentException);
-    }
-  
   if (_cell.image_position == NSNoImage)
     {
       [self setImagePosition: NSImageOnly];
     }
   
-  ASSIGN (_cell_image, anImage);
+  [super setImage: anImage];
 }
 
 /**<p>Sets the NSButtonCell's alternate image to <var>anImage</var>.</p>
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index e22b59ba3..dbcf080c9 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1115,6 +1115,9 @@ many times.
   previous content view.  */
 - (void) setContentView: (NSView*)aView
 {
+  if (aView == _contentView)
+    return;
+
   if (aView == nil)
     {
       aView = AUTORELEASE([[NSView alloc]