diff --git a/settings/build.gradle b/settings/build.gradle
index 28074ad0c..b7bb483a6 100644
--- a/settings/build.gradle
+++ b/settings/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.18'
+    id 'org.jetbrains.intellij' version '0.4.21'
 }
 
 group 'org.intellij.sdk'
@@ -13,9 +13,14 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
     version '2020.1'
-    sameSinceUntilBuild = true
+}
+
+buildSearchableOptions {
+    enabled = false
 }
 
 patchPluginXml {
     version = project.version
+    sinceBuild = '201'
+    untilBuild = '201.*'
 }
diff --git a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java
index 0ff644c07..205f340ed 100644
--- a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java
+++ b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 
 /**
- * This class has responsibility for creating and managing a JPanel for the Settings Dialog.
+ * Supports creating and managing a JPanel for the Settings Dialog.
  */
 public class AppSettingsComponent {
   private final JPanel myMainPanel;
diff --git a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsConfigurable.java b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsConfigurable.java
index 4c5dc1029..bf132d877 100644
--- a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsConfigurable.java
+++ b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsConfigurable.java
@@ -11,10 +11,9 @@ import javax.swing.*;
 
 /**
  * Provides controller functionality for application settings.
- * See com.intellij.openapi.options.Configurable for additional documentation.
 */
 public class AppSettingsConfigurable implements Configurable {
-  private AppSettingsComponent mySettingsComponent = null;
+  private AppSettingsComponent mySettingsComponent;
 
   // A default constructor with no arguments is required because this implementation
   // is registered as an applicationConfigurable EP
diff --git a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java
index 07be477c8..ae93e6e98 100644
--- a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java
+++ b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java
@@ -11,8 +11,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * This class is responsible for storing the application settings in a persistent way.
- * The State and Storage macros define the name of the data and the file name where
+ * Supports storing the application settings in a persistent way.
+ * The State and Storage annotations define the name of the data and the file name where
  * these persistent application settings are stored.
  */
 @State(