diff --git a/ChangeLog b/ChangeLog
index 4108673ba..b77134658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-09  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSTableView.m:
+	* Source/GSNibLoading.m: Move -[coder setClassName: @"_NSCornerView"
+	forClass: [GSTableCornerView class]] call from
+	-[NSTableView initWithCoder:] to GSNibLoading, because corner views
+	can be encountered before hitting -[NSTableView initWithCoder:]
+
+2012-03-09  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSClipView.m: Re-enable copy-on-scroll
+
 2012-03-09  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSWindow.m: Only invoke -prepareForDragOperation: if the
diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m
index 21cdff475..2ec36b66f 100644
--- a/Source/GSNibLoading.m
+++ b/Source/GSNibLoading.m
@@ -1738,6 +1738,9 @@ static BOOL _isInInterfaceBuilder = NO;
       NSArray *accessibilityOidsKeys = nil;
       NSArray *accessibilityOidsValues = nil;
 
+      [(NSKeyedUnarchiver *)coder setClass: NSClassFromString(@"GSTableCornerView")
+			      forClassName: @"_NSCornerView"];
+
       //
       // Get root, font, framwork and oid. 
       // Retain objects since NSKeyedUnarchiver autoreleases unarchived objects.
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index 2cfd72b5a..8895e5fab 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -5573,8 +5573,6 @@ This method is deprecated, use -columnIndexesInRect:. */
           [self setRowHeight: [aDecoder decodeFloatForKey: @"NSRowHeight"]];
         }
 
-      [(NSKeyedUnarchiver *)aDecoder setClass: [GSTableCornerView class] 
-                            forClassName: @"_NSCornerView"];
       if ([aDecoder containsValueForKey: @"NSCornerView"])
         {
 	  NSView *aView = [aDecoder decodeObjectForKey: @"NSCornerView"];