diff --git a/app/src/processing/app/contrib/ContributionManager.java b/app/src/processing/app/contrib/ContributionManager.java
index 845885f3d..46be04a90 100644
--- a/app/src/processing/app/contrib/ContributionManager.java
+++ b/app/src/processing/app/contrib/ContributionManager.java
@@ -306,7 +306,7 @@ public class ContributionManager {
    *          The list of AvailableContributions to be downloaded and installed.
    */
   public static void downloadAndInstallOnImport(final Base base,
-                                                final ArrayList<AvailableContribution> aList) {
+                                                final List<AvailableContribution> aList) {
 
     // To avoid the user from modifying stuff, since this function is only called
     // during pre-processing
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 5ed28ce6a..92ad5d27e 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -21,6 +21,8 @@ import javax.swing.text.Document;
 
 import org.eclipse.jdt.core.compiler.IProblem;
 
+import processing.core.PApplet;
+
 import processing.app.*;
 import processing.app.Toolkit;
 import processing.app.contrib.AvailableContribution;
@@ -30,7 +32,6 @@ import processing.app.contrib.ContributionManager;
 import processing.app.contrib.ToolContribution;
 import processing.app.syntax.JEditTextArea;
 import processing.app.syntax.PdeTextAreaDefaults;
-import processing.core.PApplet;
 import processing.mode.java.debug.LineBreakpoint;
 import processing.mode.java.debug.LineHighlight;
 import processing.mode.java.debug.LineID;
@@ -1914,7 +1915,7 @@ public class JavaEditor extends Editor {
           for (String[] importStatement : pieces) {
             importHeaders.add(importStatement[2]);
           }
-          ArrayList<AvailableContribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
+          List<AvailableContribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
           if (!installLibsHeaders.isEmpty()) {
             StringBuilder libList = new StringBuilder("Would you like to install them now?");
             for (AvailableContribution ac : installLibsHeaders) {
@@ -1942,7 +1943,7 @@ public class JavaEditor extends Editor {
    *
    * @param importHeaders
    */
-  private ArrayList<AvailableContribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
+  private List<AvailableContribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
     Map<String, Contribution> importMap = ContributionListing.getInstance().librariesByImportHeader;
     ArrayList<AvailableContribution> libList = new ArrayList<AvailableContribution>();
     for (String importHeaders : importHeadersList) {
@@ -2117,22 +2118,22 @@ public class JavaEditor extends Editor {
 
 
   protected void activateContinue() {
-    inspector.activateContinue();
+    ((JavaToolbar) toolbar).activateContinue();
   }
 
 
   protected void deactivateContinue() {
-    inspector.deactivateContinue();
+    ((JavaToolbar) toolbar).deactivateContinue();
   }
 
 
   protected void activateStep() {
-    inspector.activateStep();
+    ((JavaToolbar) toolbar).activateStep();
   }
 
 
   protected void deactivateStep() {
-    inspector.deactivateStep();
+    ((JavaToolbar) toolbar).deactivateStep();
   }
 
 
diff --git a/java/src/processing/mode/java/JavaToolbar.java b/java/src/processing/mode/java/JavaToolbar.java
index c57fc5290..d6f23fd44 100644
--- a/java/src/processing/mode/java/JavaToolbar.java
+++ b/java/src/processing/mode/java/JavaToolbar.java
@@ -137,6 +137,30 @@ public class JavaToolbar extends EditorToolbar {
   public void handleStop() {
     jeditor.handleStop();
   }
+
+
+  public void activateContinue() {
+    continueButton.setSelected(true);
+    repaint();
+  }
+
+
+  protected void deactivateContinue() {
+    continueButton.setSelected(false);
+    repaint();
+  }
+
+
+  protected void activateStep() {
+    stepButton.setSelected(true);
+    repaint();
+  }
+
+
+  protected void deactivateStep() {
+    stepButton.setSelected(false);
+    repaint();
+  }
 }
 
 
diff --git a/java/src/processing/mode/java/VariableInspector.java b/java/src/processing/mode/java/VariableInspector.java
index 4c711fb1a..0933f8558 100644
--- a/java/src/processing/mode/java/VariableInspector.java
+++ b/java/src/processing/mode/java/VariableInspector.java
@@ -255,6 +255,7 @@ public class VariableInspector extends JDialog {
   }
 
 
+  /*
   protected void activateContinue() {
   }
 
@@ -269,6 +270,7 @@ public class VariableInspector extends JDialog {
 
   protected void deactivateStep() {
   }
+  */
 
 
   /*