diff --git a/java/java-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java
index 11ce35a12791..992c7920cdfe 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java
@@ -39,11 +39,11 @@ public class MethodSuperSearcher implements QueryExecutor<MethodSignatureBackedB
   }
 
   private static boolean addSuperMethods(final HierarchicalMethodSignature signature,
-                                  final PsiMethod method,
-                                  final PsiClass parentClass,
-                                  final boolean allowStaticMethod,
-                                  final boolean checkBases,
-                                  final Processor<MethodSignatureBackedByPsiMethod> consumer) {
+                                         final PsiMethod method,
+                                         final PsiClass parentClass,
+                                         final boolean allowStaticMethod,
+                                         final boolean checkBases,
+                                         final Processor<MethodSignatureBackedByPsiMethod> consumer) {
     PsiMethod signatureMethod = signature.getMethod();
     PsiClass hisClass = signatureMethod.getContainingClass();
     if (parentClass == null || InheritanceUtil.isInheritorOrSelf(parentClass, hisClass, true)) {
diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java b/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
index 5a70a6862181..a8f9bfb88ed4 100644
--- a/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
@@ -323,7 +323,7 @@ public class MethodSignatureUtil {
   }
 
   @NotNull
-  public static PsiMethod[] convertMethodSignaturesToMethods(List<MethodSignatureBackedByPsiMethod> sameNameMethodList) {
+  public static PsiMethod[] convertMethodSignaturesToMethods(List<? extends MethodSignatureBackedByPsiMethod> sameNameMethodList) {
     final PsiMethod[] methods = new PsiMethod[sameNameMethodList.size()];
     for (int i = 0; i < sameNameMethodList.size(); i++) {
       methods[i] = sameNameMethodList.get(i).getMethod();
diff --git a/java/openapi/src/com/intellij/psi/util/PsiSuperMethodUtil.java b/java/openapi/src/com/intellij/psi/util/PsiSuperMethodUtil.java
index a41cd9ad528f..9646bb12fdb9 100644
--- a/java/openapi/src/com/intellij/psi/util/PsiSuperMethodUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/PsiSuperMethodUtil.java
@@ -18,6 +18,7 @@ package com.intellij.psi.util;
 import com.intellij.psi.*;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
 
@@ -67,7 +68,7 @@ public class PsiSuperMethodUtil {
     return null;
   }
 
-  public static boolean isSuperMethod(PsiMethod method, PsiMethod superMethod) {
+  public static boolean isSuperMethod(@NotNull PsiMethod method, @NotNull PsiMethod superMethod) {
     HierarchicalMethodSignature signature = method.getHierarchicalMethodSignature();
     for (HierarchicalMethodSignature supsig : signature.getSuperSignatures()) {
       PsiMethod supsigme = supsig.getMethod();
diff --git a/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java b/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
index 33ae94e2aeae..e12ebb456dce 100644
--- a/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -897,8 +897,8 @@ public class TypeConversionUtil {
    */
   @NotNull
   public static PsiSubstitutor getSuperClassSubstitutor(@NotNull PsiClass superClass,
-                                                        PsiClass derivedClass,
-                                                        PsiSubstitutor derivedSubstitutor) {
+                                                        @NotNull PsiClass derivedClass,
+                                                        @NotNull PsiSubstitutor derivedSubstitutor) {
     // [dsl] assertion commented out since we no longer cache isInheritor
     //LOG.assertTrue(derivedClass.isInheritor(superClass, true), "Not inheritor: " + derivedClass + " super: " + superClass);
 
@@ -928,8 +928,8 @@ public class TypeConversionUtil {
     }
     if (substitutor == null) {
       LOG.error(
-        "Not inheritor: " + derivedClass + "(" + derivedClass.getClass().getName() + "; " + PsiUtil.getVirtualFile(derivedClass) + ");" +
-        "\n super: " + superClass + "(" + superClass.getClass().getName() + "; " + PsiUtil.getVirtualFile(superClass) + ")");
+        "Not inheritor: " + derivedClass + "(" + derivedClass.getClass().getName() + "; " + PsiUtilBase.getVirtualFile(derivedClass) + ");" +
+        "\n super: " + superClass + "(" + superClass.getClass().getName() + "; " + PsiUtilBase.getVirtualFile(superClass) + ")");
     }
     return substitutor;
   }
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
index 729efea586e3..dbf72d5b6432 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
@@ -60,7 +60,8 @@ public class LowLevelSearchUtil {
                                        final PsiElement scope,
                                        final StringSearcher searcher,
                                        final int offset,
-                                       final boolean ignoreInjectedPsi, ProgressIndicator progress) {
+                                       final boolean ignoreInjectedPsi,
+                                       ProgressIndicator progress) {
     final int scopeStartOffset = scope.getTextRange().getStartOffset();
     final int patternLength = searcher.getPatternLength();
     PsiElement leafElement = null;