diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java
index d31b208337e3..cd720ae700a2 100644
--- a/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java
+++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java
@@ -172,7 +172,7 @@ public class ExcludedEntriesConfigurable implements UnnamedConfigurable {
       if (selected > savedSelected) { // actually added something
         AbstractTableModel model = (AbstractTableModel)myExcludedTable.getModel();
         model.fireTableRowsInserted(savedSelected, selected-1);
-        myExcludedTable.setRowSelectionInterval(savedSelected, selected-1);
+        myExcludedTable.setRowSelectionInterval(savedSelected, selected - 1);
       }
     }
 
@@ -291,7 +291,7 @@ public class ExcludedEntriesConfigurable implements UnnamedConfigurable {
       myExcludedTable.setDefaultRenderer(Boolean.class, new BooleanRenderer());
       myExcludedTable.setDefaultRenderer(Object.class, new MyObjectRenderer());
       myExcludedTable.getColumn(names[0]).setPreferredWidth(350);
-      final int cbWidth = 15 + myExcludedTable.getFontMetrics(myExcludedTable.getFont()).stringWidth(names[1]);
+      final int cbWidth = 15 + myExcludedTable.getTableHeader().getFontMetrics(myExcludedTable.getTableHeader().getFont()).stringWidth(names[1]);
       final TableColumn cbColumn = myExcludedTable.getColumn(names[1]);
       cbColumn.setPreferredWidth(cbWidth);
       cbColumn.setMaxWidth(cbWidth);
diff --git a/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java b/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java
index 9c8c8ad81663..def47a4cd30a 100644
--- a/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java
+++ b/platform/platform-api/src/com/intellij/ui/PanelWithButtons.java
@@ -36,7 +36,7 @@ public abstract class PanelWithButtons extends JPanel {
 
     add(
         mainComponent,
-        new GridBagConstraints(0, 1, 1, buttons.length, 1, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 4), 0, 0)
+        new GridBagConstraints(0, 1, 1, buttons.length == 0 ? 1 : buttons.length, 1, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, buttons.length == 0 ? 0 : 4), 0, 0)
     );
 
     for (int i = 0; i < buttons.length; i++) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
index af7ee5564440..8a68b66d82b6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
@@ -213,7 +213,6 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
 
     myMainSplitter = new Splitter(false);
     myMainSplitter.setFirstComponent(myLeftSide);
-    myMainSplitter.setHonorComponentsMinimumSize(false);
 
     myLoadingDecorator = new LoadingDecorator(myOwnDetails.getComponent(), this, 150);
     myMainSplitter.setSecondComponent(myLoadingDecorator.getComponent());
@@ -629,7 +628,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
 
     private final Splitter mySplitter = new Splitter(false);
     private JPanel myLeft = new JPanel(new BorderLayout());
-    public float myLastSplitterProproprtion;
+    public float myLastSplitterProportion;
 
     private ContentWrapper() {
       setLayout(new BorderLayout());
@@ -641,7 +640,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
 
       mySplitter.addPropertyChangeListener(Splitter.PROP_PROPORTION, new PropertyChangeListener() {
         public void propertyChange(final PropertyChangeEvent evt) {
-          myLastSplitterProproprtion = ((Float)evt.getNewValue()).floatValue();
+          myLastSplitterProportion = ((Float)evt.getNewValue()).floatValue();
         }
       });
     }
@@ -698,7 +697,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
 
       mySplitter.setFirstComponent(myLeft);
       mySplitter.setSecondComponent(myDetails.getComponent());
-      mySplitter.setProportion(myLastSplitterProproprtion);
+      mySplitter.setProportion(myLastSplitterProportion);
 
       add(mySplitter, BorderLayout.CENTER);
 
@@ -938,7 +937,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
     myDisposed = true;
 
     myProperties.setValue(MAIN_SPLITTER_PROPORTION, String.valueOf(myMainSplitter.getProportion()));
-    myProperties.setValue(DETAILS_SPLITTER_PROPORTION, String.valueOf(myContentWrapper.myLastSplitterProproprtion));
+    myProperties.setValue(DETAILS_SPLITTER_PROPORTION, String.valueOf(myContentWrapper.myLastSplitterProportion));
     myProperties.setValue(SEARCH_VISIBLE, Boolean.valueOf(isFilterFieldVisible()).toString());
 
     Toolkit.getDefaultToolkit().removeAWTEventListener(this);