diff --git a/flutter-studio/flutter-studio.iml b/flutter-studio/flutter-studio.iml
index fb5e46f3f3..f7e726c0e9 100644
--- a/flutter-studio/flutter-studio.iml
+++ b/flutter-studio/flutter-studio.iml
@@ -45,12 +45,8 @@
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.android.projectSystem.tests" />
-    <orderEntry type="library" name="com.android.tools.analytics-library:protos" level="project" />
-    <orderEntry type="library" name="com.android.tools:sdk-common" level="project" />
-    <orderEntry type="library" name="com.android.tools:annotations" level="project" />
     <orderEntry type="library" name="com.android.tools:common" level="project" />
     <orderEntry type="library" name="com.android.tools:repository" level="project" />
-    <orderEntry type="library" name="fest-swing" level="project" />
     <orderEntry type="library" name="studio-analytics-proto" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/flutter-studio/src/io/flutter/project/FlutterProjectModel.java b/flutter-studio/src/io/flutter/project/FlutterProjectModel.java
index fe24cad595..41e24b8ac5 100644
--- a/flutter-studio/src/io/flutter/project/FlutterProjectModel.java
+++ b/flutter-studio/src/io/flutter/project/FlutterProjectModel.java
@@ -48,7 +48,7 @@ public class FlutterProjectModel extends WizardModel {
   public FlutterProjectModel(@NotNull FlutterProjectType type) {
     myProjectType.set(new OptionalValueProperty<>(type));
 
-    myCompanyDomain.addListener(sender -> {
+    myCompanyDomain.addListener(() -> {
       String domain = myCompanyDomain.get();
       if (domain.isEmpty()) {
         domain = null; // Keys with null values are deleted.
@@ -59,10 +59,10 @@ public FlutterProjectModel(@NotNull FlutterProjectType type) {
     myProjectName.addConstraint(String::trim);
 
     myKotlin.set(getInitialKotlinSupport());
-    myKotlin.addListener(sender -> setInitialKotlinSupport(myKotlin.get()));
+    myKotlin.addListener(() -> setInitialKotlinSupport(myKotlin.get()));
 
     mySwift.set(getInitialSwiftSupport());
-    mySwift.addListener(sender -> setInitialSwiftSupport(mySwift.get()));
+    mySwift.addListener(() -> setInitialSwiftSupport(mySwift.get()));
   }
 
   public void setSample(@Nullable FlutterSample sample) {
diff --git a/flutter-studio/src/io/flutter/project/FlutterSettingsStep.java b/flutter-studio/src/io/flutter/project/FlutterSettingsStep.java
index 19b0ed371a..e31c0fe2e8 100644
--- a/flutter-studio/src/io/flutter/project/FlutterSettingsStep.java
+++ b/flutter-studio/src/io/flutter/project/FlutterSettingsStep.java
@@ -65,7 +65,7 @@ public String get() {
     BoolProperty isPackageSynced = new BoolValueProperty(true);
     myBindings.bind(packageNameText, computedPackageName, isPackageSynced);
     myBindings.bind(model.packageName(), packageNameText);
-    myListeners.receive(packageNameText, value -> isPackageSynced.set(value.equals(computedPackageName.get())));
+    myListeners.listen(packageNameText, value -> isPackageSynced.set(value.equals(computedPackageName.get())));
 
     myBindings.bindTwoWay(new TextProperty(myCompanyDomain), model.companyDomain());
 
diff --git a/tool/plugin/lib/plugin.dart b/tool/plugin/lib/plugin.dart
index d8addb8b97..370caef852 100644
--- a/tool/plugin/lib/plugin.dart
+++ b/tool/plugin/lib/plugin.dart
@@ -619,6 +619,23 @@ class BuildCommand extends ProductCommand {
         );
         processedFile.writeAsStringSync(source);
       }
+      if (spec.version != '3.6') {
+        // There is no 3.6 yet, but these edits will be needed for next canary
+        log('spec.version: ${spec.version}');
+        processedFile = File(
+            'flutter-studio/src/io/flutter/project/FlutterProjectModel.java');
+        source = processedFile.readAsStringSync();
+        files[processedFile] = source;
+        source = source.replaceAll('addListener(()', 'addListener(sender');
+        processedFile.writeAsStringSync(source);
+
+        processedFile = File(
+            'flutter-studio/src/io/flutter/project/FlutterSettingsStep.java');
+        source = processedFile.readAsStringSync();
+        files[processedFile] = source;
+        source = source.replaceAll('listen', 'receive');
+        processedFile.writeAsStringSync(source);
+      }
 
       try {
         result = await runner.javac2(spec);