diff --git a/platform/analysis-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java b/platform/analysis-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
index 9997f6b161ad..da9f4989871a 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
@@ -17,6 +17,7 @@ package com.intellij.codeInspection;
 
 import com.intellij.util.ArrayFactory;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Base class for problems returned by local and global inspection tools.
@@ -43,12 +44,14 @@ public interface CommonProblemDescriptor {
    *
    * @return the template for the problem description.
    */
-  @NotNull String getDescriptionTemplate();
+  @NotNull
+  String getDescriptionTemplate();
 
   /**
    * Returns the quickfixes for the problem.
    *
    * @return the list of quickfixes registered for the problem.
    */
+  @Nullable
   QuickFix[] getFixes();
 }
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/QuickFix.java b/platform/analysis-api/src/com/intellij/codeInspection/QuickFix.java
index be5c35281231..e36019c52942 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/QuickFix.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/QuickFix.java
@@ -40,7 +40,8 @@ public interface QuickFix<D extends CommonProblemDescriptor> {
    * if the name of the quickfix is "Create template &lt;filename&gt", the return value of getFamilyName() should be "Create template".
    * If the name of the quickfix does not depend on a specific element, simply return getName().
    */
-  @NotNull String getFamilyName();
+  @NotNull
+  String getFamilyName();
 
   /**
    * Called to apply the fix.