diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m
index f1408b728..474421785 100644
--- a/macosx/AddMagnetWindowController.m
+++ b/macosx/AddMagnetWindowController.m
@@ -95,8 +95,6 @@
         [fLocationImageView setImage: nil];
     }
     
-    #warning enable after 2.7
-    /*
     #warning when 10.7-only, switch to auto layout
     [fMagnetLinkLabel sizeToFit];
     
@@ -154,7 +152,6 @@
     [fCancelButton setFrame: cancelButtonFrame];
     
     [fStartCheck sizeToFit];
-     */
 }
 
 - (void) windowDidLoad
diff --git a/macosx/InfoGeneralViewController.m b/macosx/InfoGeneralViewController.m
index aa606ad3c..6330c47a4 100644
--- a/macosx/InfoGeneralViewController.m
+++ b/macosx/InfoGeneralViewController.m
@@ -51,8 +51,7 @@
     [super dealloc];
 }
 
-#warning uncomment after 2.7
-/*- (void) awakeFromNib
+- (void) awakeFromNib
 {
     #warning remove when 10.7-only with auto layout
     [fInfoSectionLabel sizeToFit];
@@ -94,7 +93,7 @@
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
     }
-}*/
+}
 
 - (void) setInfoForTorrents: (NSArray *) torrents
 {
diff --git a/macosx/InfoOptionsViewController.m b/macosx/InfoOptionsViewController.m
index 3a82d1108..e752e269e 100644
--- a/macosx/InfoOptionsViewController.m
+++ b/macosx/InfoOptionsViewController.m
@@ -64,7 +64,7 @@
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateOptionsNotification:) name: @"UpdateOptionsNotification" object: nil];
     
     #warning remove when 10.7-only with auto layout
-    /*const CGFloat padding = 6.0; //this shows as 8 in IB
+    const CGFloat padding = 6.0; //this shows as 8 in IB
     [fPrioritySectionLabel sizeToFit];
     [fPriorityLabel sizeToFit];
     NSRect priorityPopUpFrame = [fPriorityPopUp frame];
@@ -128,7 +128,7 @@
     [fPeersConnectLabel sizeToFit];
     NSRect peersConnectLabelFrame = [fPeersConnectLabel frame];
     peersConnectLabelFrame.origin.x = NSMaxX(peersConnectFrame) + padding;
-    [fPeersConnectLabel setFrame: peersConnectLabelFrame];*/
+    [fPeersConnectLabel setFrame: peersConnectLabelFrame];
 }
 
 - (void) dealloc