diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
index 3576217148..bef56759d2 100644
--- a/app/src/processing/app/Toolkit.java
+++ b/app/src/processing/app/Toolkit.java
@@ -182,7 +182,9 @@ static public void setIcon(Window window) {
     }
   }
 
-
+  static public void setIcon(java.awt.Frame frame) {
+	// do nothing; stub out to fix Modes that use this call.
+  }
   // someone needs to be slapped
   //static KeyStroke closeWindowKeyStroke;
 
diff --git a/build/build.xml b/build/build.xml
index 4d0f0b2335..abb3dce433 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -472,6 +472,14 @@
     <copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/lib/fonts">
       <fileset dir="shared/lib/fonts" includes="*" />
     </copy>
+	<copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/bin">
+	  <fileset dir="/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/bin" includes="java,javac" />
+	</copy>
+	<copy todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/lib">
+	  <fileset dir="/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/lib" includes="tools.jar" />
+	</copy>
+	<chmod perm="ugo+x" file="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/bin/java*" />
+	
 
     <antcall target="assemble">
       <param name="target.path"