diff --git a/build-windows.xml b/build-windows.xml
index 9861c70831..50daf66542 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -72,7 +72,7 @@
         <move file="${nbdist.dir}/installer_${app.name}_32-SetupFiles/installer_${app.name}_32.msi" tofile="${nbdist.dir}/installer_${app.name}_32-${app.version}.msi" />
     </target>
     
-    <target name="run-ai-32" depends="add-ai-productinfo,add-ai-files,add-ai-jre-32,add-ai-shortcuts,add-ai-env">
+    <target name="run-ai-32" depends="add-ai-productinfo,add-ai-files,add-ai-jre-32,add-ai-shortcuts-32,add-ai-env">
         <!-- Leaving this commented out bit for documentation purposes. Not sure what its supposed to do. -->       
         <!-- Need to find a way to deal with beta version -->
         <!--<echo message="Setting ${app.name} version to ${app.version}..."/>
@@ -91,7 +91,7 @@
         <move file="${nbdist.dir}/installer_${app.name}_64-SetupFiles/installer_${app.name}_64.msi" tofile="${nbdist.dir}/installer_${app.name}_64-${app.version}.msi" />
     </target>
     
-    <target name="run-ai-64" depends="add-ai-productinfo,add-ai-files,add-ai-jre-64,add-ai-shortcuts,add-ai-env"/>
+    <target name="run-ai-64" depends="add-ai-productinfo,add-ai-files,add-ai-jre-64,add-ai-shortcuts-64,add-ai-env"/>
    
     <target name="add-ai-productinfo" description="Add product information to the aip file">
         <scriptdef name="generateguid" language="javascript">
@@ -161,7 +161,7 @@
         </exec>
     </target>
 
-    <target name="add-ai-shortcuts" description="Add shortcuts to the aip file">
+    <target name="add-ai-shortcuts-32" description="Add shortcuts to the aip file">
         <echo message="Adding desktop/menu shortcuts..."/>
         <exec executable="${ai-exe-path}">
             <arg line="/edit ${aip-path} /NewShortcut -name ${app.title} -dir DesktopFolder -target APPDIR\bin\${app.name}.exe -icon ${inst-path}\icon.ico"/>
@@ -170,6 +170,16 @@
             <arg line="/edit ${aip-path} /NewShortcut -name ${app.title} -dir SHORTCUTDIR -target APPDIR\bin\${app.name}.exe -icon ${inst-path}\icon.ico"/>
         </exec>
     </target>
+    
+    <target name="add-ai-shortcuts-64" description="Add shortcuts to the aip file">
+        <echo message="Adding desktop/menu shortcuts..."/>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /NewShortcut -name ${app.title} -dir DesktopFolder -target APPDIR\bin\${app.name}64.exe -icon ${inst-path}\icon.ico"/>
+        </exec>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /NewShortcut -name ${app.title} -dir SHORTCUTDIR -target APPDIR\bin\${app.name}64.exe -icon ${inst-path}\icon.ico"/>
+        </exec>
+    </target>
 
     <!-- TODO: does this always need to be done, or just for 64 bit files? -->
     <target name="add-ai-env" description="Add the enviornment variables to the aip file">
diff --git a/build.xml b/build.xml
index 53be58ed39..11f80417cb 100644
--- a/build.xml
+++ b/build.xml
@@ -46,15 +46,6 @@
         <echo> TSK_HOME: ${env.TSK_HOME}</echo>
     </target>
     
-<!--     Verify that the JRE_HOME env variable is set 
-    <target name="findJRE">
-        <property environment="env"/>
-        <condition property="jreFound">
-            <isset property="env.JRE_HOME"/>
-        </condition>
-        <fail unless="jreFound" message="JRE_HOME must be set as an environment variable."/>
-    </target>-->
-    
      <target name="getJunit">
         <property name="junit.dir" value="${thirdparty.dir}/junit/${netbeans-plat-version}" />
          <unzip src="${junit.dir}/junit.zip" dest="${nbplatform.active.dir}"/>
@@ -80,9 +71,6 @@
         <copy file="${basedir}/KNOWN_ISSUES.txt" tofile="${zip-tmp}/${app.name}/KNOWN_ISSUES.txt"/>
          
         <unzip src="${thirdparty.dir}/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${zip-tmp}/${app.name}/gstreamer"/>
-<!--        <copy todir="${zip-tmp}/${app.name}/jre">
-            <fileset dir="${env.JRE_HOME}"/>
-        </copy>-->
         <copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
         
         <property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" />