diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
index 32396c8643e1..2d5ad682d109 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
@@ -448,7 +448,7 @@ public class FileTreeModelBuilder {
     PackageDependenciesNode directoryNode = myModuleDirNodes.get(virtualFile);
     if (directoryNode != null) {
       if (myCompactEmptyMiddlePackages) {
-        DirectoryNode nestedNode = ((DirectoryNode)directoryNode).getCompactedDirNode();
+        final DirectoryNode nestedNode = ((DirectoryNode)directoryNode).getCompactedDirNode();
         if (nestedNode != null) { //decompact
           boolean expand = false;
           if (myTree != null){
@@ -465,7 +465,12 @@ public class FileTreeModelBuilder {
           parentWrapper.add(nestedNode);
           nestedNode.removeUpReference();
           if (myTree != null && expand) {
-            myTree.expandPath(new TreePath(nestedNode.getPath()));
+            final Runnable expandRunnable = new Runnable() {
+              public void run() {
+                myTree.expandPath(new TreePath(nestedNode.getPath()));
+              }
+            };
+            SwingUtilities.invokeLater(expandRunnable);
           }
           return parentWrapper;
         }
diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java
index fa47c33eddb2..9b103708544b 100644
--- a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowManager.java
@@ -113,7 +113,6 @@ public abstract class ToolWindowManager {
    * @return registered tool window with specified <code>id</code>. If there is no registered
    * tool window with specified <code>id</code> then the method returns <code>null</code>.
    */
-  @Nullable
   public abstract ToolWindow getToolWindow(String id);
 
   /**
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index 4c1c92dd8cc7..bb1f727859fb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -643,7 +643,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
   public Dimension getPreferredSize() {
     final ArrayList<Rectangle> bounds = new ArrayList<Rectangle>();
     calculateBounds(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE), bounds);
-
+    if (bounds.isEmpty()) return new Dimension(0, 0);
     int xLeft = Integer.MAX_VALUE;
     int yTop = Integer.MAX_VALUE;
     int xRight = Integer.MIN_VALUE;
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
index 7d86677fa4c8..b32216be18df 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
@@ -338,7 +338,7 @@ public class InfoAndProgressPanel extends JPanel implements CustomStatusBarWidge
 
     final JPanel inlinePanel = new JPanel(new BorderLayout());
 
-    inline.getComponent().setBorder(new EmptyBorder(0, 0, 0, 2));
+    inline.getComponent().setBorder(new EmptyBorder(1, 0, 0, 2));
     final JComponent inlineComponent = inline.getComponent();
     inlineComponent.setOpaque(false);
     inlinePanel.add(inlineComponent, BorderLayout.CENTER);
diff --git a/platform/util/src/com/intellij/openapi/ui/Splitter.java b/platform/util/src/com/intellij/openapi/ui/Splitter.java
index 93e446a10bfa..25933d3f5490 100644
--- a/platform/util/src/com/intellij/openapi/ui/Splitter.java
+++ b/platform/util/src/com/intellij/openapi/ui/Splitter.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.FocusWatcher;
 import com.intellij.ui.UIBundle;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -406,7 +407,7 @@ public class Splitter extends JPanel {
    *
    * @param component
    */
-  public void setFirstComponent(JComponent component) {
+  public void setFirstComponent(@Nullable JComponent component) {
     if (myFirstComponent != component) {
       if (myFirstComponent != null) {
         remove(myFirstComponent);
@@ -437,7 +438,7 @@ public class Splitter extends JPanel {
    *
    * @param component
    */
-  public void setSecondComponent(JComponent component) {
+  public void setSecondComponent(@Nullable JComponent component) {
     if (mySecondComponent != component) {
       if (mySecondComponent != null) {
         remove(mySecondComponent);
diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
index fa8e1f60e5b8..90db52f6e012 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
@@ -8,8 +8,7 @@
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="e7277" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+      <grid id="e7277" layout-manager="GridBagLayout">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
@@ -19,6 +18,7 @@
           <component id="52bca" class="com.intellij.ui.components.JBLabel" binding="myTestLabel">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <gridbag weightx="0.0" weighty="1.0"/>
             </constraints>
             <properties>
               <horizontalAlignment value="2"/>
@@ -31,6 +31,7 @@
           <component id="4ae33" class="javax.swing.JComboBox" binding="myTypeChooser">
             <constraints>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+              <gridbag top="0" left="10" bottom="0" right="0" weightx="1.0" weighty="1.0"/>
             </constraints>
             <properties/>
           </component>