diff --git a/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java b/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java
index 77ec84799e41..c9227994a83c 100644
--- a/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java
+++ b/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java
@@ -18,7 +18,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
   private static final class RegexpMatcher implements MaskMatcher {
     private final Matcher myMatcher;
 
-    private RegexpMatcher(String pattern) {
+    RegexpMatcher(@NotNull String pattern) {
       myMatcher = PatternUtil.fromMask(pattern).matcher("");
     }
 
@@ -34,7 +34,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
   private static final class SuffixMatcher implements MaskMatcher {
     private final String mySuffix;
 
-    private SuffixMatcher(final String suffix) {
+    SuffixMatcher(@NotNull String suffix) {
       mySuffix = suffix;
     }
 
@@ -47,7 +47,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
   private static final class PrefixMatcher implements MaskMatcher {
     private final String myPrefix;
 
-    private PrefixMatcher(final String prefix) {
+    private PrefixMatcher(@NotNull String prefix) {
       myPrefix = prefix;
     }
 
@@ -60,7 +60,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
   private static final class InfixMatcher implements MaskMatcher {
     private final String myInfix;
 
-    private InfixMatcher(final String infix) {
+    InfixMatcher(@NotNull String infix) {
       myInfix = infix;
     }
 
@@ -78,7 +78,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
     myMatcher = createMatcher(pattern);
   }
 
-  private static MaskMatcher createMatcher(final String pattern) {
+  private static @NotNull MaskMatcher createMatcher(final @NotNull String pattern) {
     int len = pattern.length();
     if (len > 1 && pattern.indexOf('?') < 0) {
       if (pattern.charAt(0) == '*' && pattern.indexOf('*', 1) < 0) {
diff --git a/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/IgnoredPatternSet.java b/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/IgnoredPatternSet.java
index b04d22d88bdb..1e545b9b534e 100644
--- a/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/IgnoredPatternSet.java
+++ b/jps/model-impl/src/com/intellij/openapi/fileTypes/impl/IgnoredPatternSet.java
@@ -30,7 +30,7 @@ import java.util.StringTokenizer;
  */
 public class IgnoredPatternSet {
   private final Set<String> myMasks = new LinkedHashSet<>();
-  private final FileTypeAssocTable<Boolean> myIgnorePatterns = new FileTypeAssocTable<Boolean>().copy();
+  private final FileTypeAssocTable<Boolean> myIgnorePatterns = new FileTypeAssocTable<>();
 
   @NotNull
   Set<String> getIgnoreMasks() {
diff --git a/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
index 20e5cd16b427..419dd81e71a5 100644
--- a/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
+++ b/platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
@@ -139,7 +139,7 @@ public abstract class PsiDocumentManager {
    * @return the list of uncommitted documents.
    * @see #commitDocument(Document)
    */
-  public abstract Document @NotNull [] getUncommittedDocuments();
+  public abstract @NotNull Document @NotNull [] getUncommittedDocuments();
 
   /**
    * Checks if the specified document has been committed.
diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
index 47f645eebd83..12effa6e3240 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
@@ -818,7 +818,7 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
   }
 
   @Override
-  public Document @NotNull [] getUncommittedDocuments() {
+  public @NotNull Document @NotNull [] getUncommittedDocuments() {
     ApplicationManager.getApplication().assertReadAccessAllowed();
     Document[] documents = myUncommittedDocuments.toArray(Document.EMPTY_ARRAY);
     return ArrayUtil.stripTrailingNulls(documents);
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java
index 8b40fcb86cf3..591111393f4d 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java
@@ -192,7 +192,7 @@ public final class RepositoryHelper {
   }
 
   private static boolean ideContainsUltimateModule() {
-    IdeaPluginDescriptor corePlugin = PluginManagerCore.getPlugin(PluginId.getId(PluginManagerCore.CORE_PLUGIN_ID));
+    IdeaPluginDescriptor corePlugin = PluginManagerCore.getPlugin(PluginManagerCore.CORE_ID);
     IdeaPluginDescriptorImpl corePluginImpl = (corePlugin instanceof IdeaPluginDescriptorImpl) ? (IdeaPluginDescriptorImpl)corePlugin : null;
     return corePluginImpl != null && corePluginImpl.getModules().contains(PluginId.getId(ULTIMATE_MODULE));
   }
diff --git a/platform/util/src/com/intellij/util/containers/HashingStrategy.java b/platform/util/src/com/intellij/util/containers/HashingStrategy.java
index 0b7372696548..2bb13708a9e1 100644
--- a/platform/util/src/com/intellij/util/containers/HashingStrategy.java
+++ b/platform/util/src/com/intellij/util/containers/HashingStrategy.java
@@ -44,7 +44,7 @@ class CaseInsensitiveCharSequenceHashingStrategy implements HashingStrategy<Char
   public boolean equals(CharSequence s1, CharSequence s2) {
     return StringUtil.equalsIgnoreCase(s1, s2);
   }
-};
+}
 
 final class CanonicalHashingStrategy<T> implements HashingStrategy<T> {
   static final HashingStrategy<?> INSTANCE = new CanonicalHashingStrategy<>();