diff --git a/Core/build.xml b/Core/build.xml
index 5cb0c3811a26a77a6a901f067d51f12e39669a84..1e8f4370e66f157b09a7cc3c7bedd94cc2640940 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -203,7 +203,7 @@
         <copy file="${thirdparty.dir}/LICENSE-2.0.txt" todir="${ext.dir}" />        
         <!-- fetch all the dependencies from Ivy and stick them in the right places -->
         <ivy:resolve log="quiet"/>
-        <ivy:report todir='${basedir}/ivy-reports' graph='true' xml='false'/>
+        <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
         <ivy:retrieve conf="core" pattern="${ext.dir}/[artifact]-[revision](-[classifier]).[ext]" />
         <delete file="${basedir}/release/modules/ext/log4j-1.2.16.jar"/>
     </target>
diff --git a/CoreLibs/build.xml b/CoreLibs/build.xml
index 139f205d8865ec22825a0e00b73bbaace92cb2e8..c1db112ce012b118cb86b25147ac32b7152cd193 100644
--- a/CoreLibs/build.xml
+++ b/CoreLibs/build.xml
@@ -32,7 +32,7 @@
     <target name="get-deps" description="retrieve dependencies using ivy" depends="init-ivy,build-native-libs,get-thirdparty-dependencies">
         <ivy:settings file="ivysettings.xml" />
         <ivy:resolve log="quiet"/>
-        <ivy:report todir='${basedir}/ivy-reports' graph='true' xml='false'/>
+        <ivy:report todir='${basedir}/build/ivy-reports' graph='true' xml='false'/>
         <ivy:retrieve pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
         <delete file="${basedir}/release/modules/ext/log4j-1.2.17.jar"/>
     </target>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index e185b9d04dd3410d1396593cbffe0d2ee3c17274..c2eac09412fb1980f4ec724809d38ce89ef07c35 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -29,6 +29,9 @@
         <dependency conf="autopsy_core->*" org="commons-lang" name="commons-lang" rev="2.6"/> 
         <dependency conf="autopsy_core->*" org="commons-logging" name="commons-logging" rev="1.1.2"/>
         <dependency conf="autopsy_core->*" org="commons-io" name="commons-io" rev="2.5"/>
+		<!-- Prevent log4j 2.17.1 from bringing in its many optional dependencies -->
+		<dependency conf="autopsy_core->*" org="org.osgi" name="osgi.core" rev="8.0.0"/>
+		<dependency conf="autopsy_core->*" org="org.apache.logging.log4j" name="log4j-api" rev="2.17.1" transitive="false"/>
         <dependency conf="autopsy_core->*" org="org.apache.logging.log4j" name="log4j-core" rev="2.17.1" transitive="false"/>
         <!-- <dependency conf="autopsy_core->*" org="org.jdom" name="jdom" rev="1.1.3"/> -->
         <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/>