diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java
index 082d094948..e7d5fc2b11 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java
@@ -62,6 +62,9 @@ class OpenRecentCasePanel extends javax.swing.JPanel {
         // If there are any images, let's select the first one
         if (imagesTable.getRowCount() > 0) {
             imagesTable.setRowSelectionInterval(0, 0);
+            openButton.setEnabled(true);
+        } else {
+            openButton.setEnabled(false);
         }
     }
 
diff --git a/build-windows.xml b/build-windows.xml
index 330321f372..cb9f2faec8 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -72,6 +72,10 @@
         <var name="aut-bin-name" value="${app.name}.exe"/>
         <var name="jre-path" value="${env.JRE_HOME_32}"/>
         <var name="package-type" value="x86" />
+        <var name="jvm.max.mem" value="512" />
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][ProductName]-${app.version}"/>
+        </exec>
         <antcall target="run-ai-32" inheritAll="true" inheritRefs="true" />
         <delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/>
         <move file="${nbdist.dir}/installer_${app.name}_32-SetupFiles/installer_${app.name}_32.msi" tofile="${nbdist.dir}/installer_${app.name}_32-${app.version}.msi" />
@@ -86,7 +90,11 @@
         <var name="aut-bin-name" value="${app.name}64.exe"/>
         <var name="jre-path" value="${env.JRE_HOME_64}"/>
         <var name="package-type" value="x64" />
+        <var name="jvm.max.mem" value="2048"/>
         <echo message="aip-path: ${aip-path}" />
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /SetAppdir -buildname DefaultBuild -path [ProgramFiles64Folder][ProductName]-${app.version}"/>
+        </exec>
         <antcall target="run-ai-64" inheritAll="true" inheritRefs="true" />
         <delete dir="${nbdist.dir}/installer_${app.name}_64-cache"/>
         <move file="${nbdist.dir}/installer_${app.name}_64-SetupFiles/installer_${app.name}_64.msi" tofile="${nbdist.dir}/installer_${app.name}_64-${app.version}.msi" />
@@ -118,7 +126,22 @@
                         replace="ProductVersion&quot; Value=&quot;${app.version}" />   
     </target>
    
-    <target name="add-ai-files" description="Add the files in the installation path to the installer file">
+    <target name="update-config" description="Updates configuration file with correct JVM args.">
+        <!-- Update configuration file to include jre -->
+        <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
+        <!-- Sets max heap size to be ${jvm.max.mem} which is set in the run-ai-(32/64) target -->
+        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />
+        <propertyfile file="${inst.property.file}">
+            <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
+            <entry key="default_options" value="@JVM_OPTIONS" />
+            <entry key="jdkhome" value="&quot;jre7&quot;" />
+        </propertyfile>
+        <!-- workaround for ant escaping : and = when setting properties -->
+        <replace file="${inst.property.file}" token="@JVM_OPTIONS" value="${jvm.args}" />
+    </target>
+    
+    
+    <target name="add-ai-files" depends="update-config" description="Add the files in the installation path to the installer file">
         <foreach target="add-file-or-dir" param="theFile" inheritall="true" inheritrefs="true">
             <path> 
                 <fileset dir="${inst-path}">
@@ -136,7 +159,6 @@
     </target>
 
     <target name="add-file-or-dir" depends="is-file-or-folder">
-        <echo message="${ai-exe-path}" /> 
         <echo message="Adding ${file-or-folder} to installer: ${theFile}"/>
         <exec executable="${ai-exe-path}">
             <arg line="/edit ${aip-path} /Add${file-or-folder} APPDIR ${theFile}" />
diff --git a/build.xml b/build.xml
index 11f80417cb..417487251e 100644
--- a/build.xml
+++ b/build.xml
@@ -78,7 +78,6 @@
         <propertyfile file="${app.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
-            <entry key="jdkhome" value="&quot;jre7&quot;" />
         </propertyfile>
         <!-- workaround for ant escaping : and = when setting properties -->
         <replace file="${app.property.file}" token="@JVM_OPTIONS" value="${jvm.options}" />
diff --git a/nbproject/project.properties b/nbproject/project.properties
index e671be54f8..d477d9c856 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -12,7 +12,7 @@ build.type=DEVELOPMENT
 update_versions=false
 #custom JVM options
 #Note: can be higher on 64 bit systems, should be in sync with build.xml
-run.args.extra=-J-Xms24m -J-Xmx512m -J-XX:MaxPermSize=128M -J-Xverify:none
+run.args.extra=-J-Xms24m -J-Xmx2048m -J-XX:MaxPermSize=128M -J-Xverify:none
 auxiliary.org-netbeans-modules-apisupport-installer.license-type=apache.v2
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false