diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index 366a36442..f99a12937 100644
Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ
diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m
index 60b74b45b..75fb66fd7 100644
--- a/macosx/PiecesView.m
+++ b/macosx/PiecesView.m
@@ -43,7 +43,7 @@
 
 - (void) awakeFromNib
 {
-        NSSize size = [fImageView frame].size;
+        NSSize size = [fImageView bounds].size;
         NSBezierPath * bp = [NSBezierPath bezierPathWithRect: [fImageView bounds]];
         
         //back image
@@ -142,8 +142,8 @@
         else
             fAcross = MAX_ACROSS;
         
-        fWidth = ([[fImageView image] size].width - (fAcross + 1) * BETWEEN) / fAcross;
-        fExtraBorder = ([[fImageView image] size].width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
+        fWidth = ([fImageView bounds].size.width - (fAcross + 1) * BETWEEN) / fAcross;
+        fExtraBorder = ([fImageView bounds].size.width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
         
         [self updateView: YES];
     }
@@ -157,11 +157,7 @@
         return;
     
     if (first)
-    {
-        NSImage * back = [fBack copy];
-        [fImageView setImage: back];
-        [back release];
-    }
+        [fImageView setImage: [[fBack copy] autorelease]];
     NSImage * image = [fImageView image];
     
     int8_t * pieces = malloc(fNumPieces);
@@ -237,7 +233,7 @@
                 }
                 
                 point = NSMakePoint(j * (fWidth + BETWEEN) + BETWEEN + fExtraBorder,
-                                    [[fImageView image] size].width - (i + 1) * (fWidth + BETWEEN) - fExtraBorder);
+                                    [image size].width - (i + 1) * (fWidth + BETWEEN) - fExtraBorder);
                 [pieceImage compositeToPoint: point fromRect: rect operation: NSCompositeSourceOver];
             }
         }