diff --git a/build/build.xml b/build/build.xml
index 6c900f97a..4d0f0b233 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -78,14 +78,14 @@
     <include name="lib/cmm/PYCC.pf" />
   </fileset>
 
-  <!-- There might be others, based on what was in the Java 6 docs, 
-       but that info isn't part of the Java 7 instructions.
-       http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html -->
-
   <!-- Unused JavaFX files that can be removed from the JRE on Windows 
        and Linux. On Mac OS X, this is removed by the appbundler task.
        www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html -->
 
+  <!-- There might be others, based on what was in the Java 6 docs, 
+       but that info isn't part of the Java 7 instructions.
+       http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html -->
+
   <fileset dir="${platform}/work/java" id="javafx-basics">
     <include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" />
     <include name="lib/javafx.properties" />
@@ -801,68 +801,21 @@
     </condition>
     <delete dir="${target.path}/modes/java/libraries/video/library/windows${video.delete}" />
     
-
-    <!-- TODO It would be better to not copy these, but use them in place.
-         I believe it's handled this way b/c launch4j was finicky about paths.
-         (i.e. it needed the lib/pde.jar to be present during build) -->
-<!--
-    <copy todir="windows/work">
-      <fileset dir="windows" 
-	       includes="about.bmp, application.ico, config.xml, config-cmd.xml"/>
-    </copy>
--->
     <taskdef name="launch4j" 
 	     classname="net.sf.launch4j.ant.Launch4jTask" 
 	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
 
     <!-- not all launch4j options are available when embedded inside this 
 	 file (i.e. the icon param doesn't work), so use a config file -->
-
-<!--
-    <launch4j configFile="windows/work/config.xml" />
-    <launch4j configFile="windows/work/config-cmd.xml" />
--->
-
     <launch4j configFile="windows/config.xml" />
     <launch4j configFile="windows/config-cmd.xml" />
 
-<!--
-    <delete dir="windows/work" 
-	    includes="about.bmp, application.ico, config.xml, config-cmd.xml" />
--->
-
-<!--
-    <launch4j>
-      <config headerType="gui"
-	      outfile="windows/work/processing-java.exe"
-	      dontWrapJar="false"
-	      jarPath="../app/pde.jar">
-	<classPath mainClass="processing.mode.java.Commander">
-	  <cp>lib/pde.jar</cp>
-	  <cp>lib/antlr.jar</cp>
-	  <cp>lib/jdt-core.jar</cp>
-	  <cp>lib/jna.jar</cp>
-	  <cp>lib/ant.jar</cp>
-	  <cp>lib/ant-launcher.jar</cp>
-	  <cp>core/library/core.jar</cp>
-	  <cp>%JAVA_HOME%/lib/tools.jar</cp>
-	</classPath>
-	<jre minVersion="1.6.0" jdkPreference="jdkOnly">
-	</jre>
-      </config>
-    </launch4j>
--->
-
     <!-- cygwin requires html, dll, and exe to have the +x flag -->
     <chmod perm="ugo+x">
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
     </chmod>
 
     <!-- starting with 2.0a7, require the local JRE + tools.jar -->
-    <!--
-    <property name="jre.file" 
-	      value="jre-tools-6u37-windows${sun.arch.data.model}.zip" />
-    -->
     <get src="http://processing.googlecode.com/files/${jre.file}" 
 	 dest="windows/jre.tgz" 
 	 usetimestamp="true" />
diff --git a/build/linux/processing b/build/linux/processing
index 14708c1ed..eedceaa5f 100755
--- a/build/linux/processing
+++ b/build/linux/processing
@@ -103,7 +103,7 @@ cmd_name='processing-java'
 
 if [ $current_name = $cmd_name ]
 then
-    java processing.mode.java.Commander "$@"
+    java -Djna.nosys=true processing.mode.java.Commander "$@"
     exit $?
 else
   # Start Processing in the same directory as this script
@@ -114,5 +114,5 @@ else
   fi
   cd "$APPDIR"
 
-  java processing.app.Base "$SKETCH" &
+  java -Djna.nosys=true processing.app.Base "$SKETCH" &
 fi
diff --git a/todo.txt b/todo.txt
index 5ae72e700..a90d16bcf 100644
--- a/todo.txt
+++ b/todo.txt
@@ -43,9 +43,9 @@ X   fix for Windows launchers
 X   fix for Windows export
 X   fix for Windows export 64-bit
 X   fix for Windows command line
-_   fix for Linux launcher
+X   fix for Linux launcher
 _   fix for Linux export
-_   fix for Linux command line
+X   fix for Linux command line
 X   fix for OS X launcher 
 X   fix for OS X export
 X   fix for OS X command line