Index: AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java	(revision 621)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java	(revision 622)
@@ -55,5 +55,5 @@
 			Type t = ModManager.getInstance().getTypeByName(tt.getName());
 			types.add(t);
-			if (!nm.isTool() && isValidOnPlatform())
+			if (!nm.isTool() && !isMandatoryMod() && isValidOnPlatform())
 				t.addEntry(this);
 		}
Index: AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java	(revision 621)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java	(revision 622)
@@ -119,5 +119,9 @@
 
 						zf = new ZipFile(zip);
+						
+						if (target.exists())
+							FileUtils.deleteDirectory(target);
 						target.mkdirs();
+
 						for (Enumeration<? extends ZipEntry> e = zf.entries(); e
 								.hasMoreElements();) {