diff --git a/Source/NSGridView.m b/Source/NSGridView.m
index adaf1c318..28649d2d9 100644
--- a/Source/NSGridView.m
+++ b/Source/NSGridView.m
@@ -306,40 +306,43 @@
 // Weak references to row/column
 - (NSGridRow *) row
 {
-  return nil;
+  return _owningRow;
 }
 
 - (NSGridColumn *) column
 {
-  return nil;
+  return _owningColumn;
 }
 
 // Placement
 - (NSGridCellPlacement) xPlacement
 {
-  return 0;
+  return _xPlacement;
 }
 
 - (void) setXPlacement: (NSGridCellPlacement)x
 {
+  _xPlacement = x;
 }
 
 - (NSGridCellPlacement) yPlacement
 {
-  return 0;
+  return _yPlacement;
 }
 
 - (void) setYPlacement: (NSGridCellPlacement)y
 {
+  _yPlacement = y;
 }
 
 - (NSGridRowAlignment) rowAlignment
 {
-  return 0;
+  return _rowAlignment;
 }
 
 - (void) setRowAlignment: (NSGridRowAlignment)a
 {
+  _rowAlignment = a;
 }
 
 // Constraints
@@ -359,6 +362,7 @@
       [coder encodeObject: _owningColumn forKey: @"NSGrid_owningColumn"]; // weak
       [coder encodeInteger: _xPlacement forKey: @"NSGrid_xPlacement"];
       [coder encodeInteger: _yPlacement forKey: @"NSGrid_yPlacement"];
+      [coder encodeInteger: _rowAlignment forKey: @"NSGrid_alignment"];
     }
   else
     {
@@ -394,6 +398,10 @@
         {
           _yPlacement = [coder decodeIntegerForKey: @"NSGrid_yPlacement"];
         }      
+      if ([coder containsValueForKey: @"NSGrid_alignment"])
+        {
+          _rowAlignment = [coder decodeIntegerForKey: @"NSGrid_alignment"];
+        }      
     }
   else
     {