diff --git a/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
index 378476e0b9da..d52838f024b0 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
@@ -158,7 +158,7 @@ public class JavaFindUsagesProvider implements FindUsagesProvider {
       PsiMethod psiMethod = (PsiMethod)element;
       String formatted = PsiFormatUtil.formatMethod(psiMethod,
                                                     PsiSubstitutor.EMPTY, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_PARAMETERS,
-                                                    PsiFormatUtil.SHOW_TYPE);
+                                                    PsiFormatUtil.SHOW_TYPE|PsiFormatUtil.SHOW_RAW_NON_TOP_TYPE);
       PsiClass psiClass = psiMethod.getContainingClass();
       if (psiClass != null) {
         return getContainingClassDescription(psiClass, formatted);
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
index b85ca9b32fbd..44c60489aafa 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
@@ -36,6 +36,8 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.progress.impl.ProgressManagerImpl;
 import com.intellij.openapi.progress.util.ProgressWrapper;
+import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.IndexNotReadyException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectUtil;
 import com.intellij.openapi.ui.Messages;
@@ -459,6 +461,11 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
       cleanup((InspectionManagerEx)manager);
       throw e;
     }
+    catch (IndexNotReadyException e) {
+      cleanup((InspectionManagerEx)manager);
+      DumbService.getInstance(myProject).showDumbModeNotification("Usage search is not available until indices are ready");
+      throw new ProcessCanceledException();
+    }
     catch (Exception e) {
       LOG.error(e);
     }
@@ -489,6 +496,9 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
         catch (ProcessCanceledException e) {
           throw e;
         }
+        catch (IndexNotReadyException e) {
+          throw e;
+        }
         catch (Exception e) {
           LOG.error(e);
         }
@@ -501,6 +511,9 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
       catch (ProcessCanceledException e) {
         throw e;
       }
+      catch (IndexNotReadyException e) {
+        throw e;
+      }
       catch (Exception e) {
         LOG.error(e);
       }
@@ -534,6 +547,9 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
         catch (ProcessCanceledException e) {
           throw e;
         }
+        catch (IndexNotReadyException e) {
+          throw e;
+        }
         catch (Exception e) {
           LOG.error(e);
         }
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
index d9c66679e357..0b1b2ce26043 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
@@ -368,7 +368,9 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
       panel.disposeUI();
     }
     myPanels.clear();
-    Disposer.dispose(mySelectionAlarm);
+    if (mySelectionAlarm != null) {
+      Disposer.dispose(mySelectionAlarm);
+    }
   }
 
   public void selectProfile(String name) {
diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
index a6ff7b45c3da..70047687e105 100644
--- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties
+++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
@@ -559,7 +559,7 @@ directory.chooser.hide.non.existent.checkBox.text=&Hide non-existent
 0.will.be.inaccessible.from.1={0} will be inaccessible from {1}
 move.classes.command=Moving {0} to package {1}
 safe.delete.command=Deleting {0}
-select.all.button=&Select all
+select.all.button=Select &all
 unselect.all.button=&Unselect all
 automatic.renamer.enity.name.column={0} name
 automatic.renamer.rename.to.column=Rename To
diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index d2d66a0421bb..5a985cceabf7 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -215,8 +215,12 @@ public class PagedFileStorage implements Forceable {
   }
 
   public void close() {
-    force();
-    unmapAll();
+    try {
+      force();
+    }
+    finally {
+      unmapAll();
+    }
   }
 
   private void unmapAll() {