diff --git a/LaunchServer/LaunchServer.iml b/LaunchServer/LaunchServer.iml
old mode 100644
new mode 100755
index 7a9a207..1e1f432
--- a/LaunchServer/LaunchServer.iml
+++ b/LaunchServer/LaunchServer.iml
@@ -9,18 +9,18 @@
       <excludeFolder url="file://$MODULE_DIR$/runtime" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" name="jline-2.12.1" level="project" />
-    <orderEntry type="library" name="mysql-5.1.36" level="project" />
-    <orderEntry type="library" name="hikaricp-2.4.0" level="project" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../build/libraries/launch4j.jar!/" />
+          <root url="jar://$MODULE_DIR$/../build/libraries/launch4j/launch4j.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="jline-2.12.1" level="project" />
+    <orderEntry type="library" name="mysql-5.1.36" level="project" />
+    <orderEntry type="library" name="hikaricp-2.4.0" level="project" />
     <orderEntry type="module" module-name="Launcher" exported="" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/LaunchServer/resources/launchserver/defaults/profile1.10.2.cfg b/LaunchServer/resources/launchserver/defaults/profile1.10.2.cfg
index 59f7018..f3cfc90 100755
--- a/LaunchServer/resources/launchserver/defaults/profile1.10.2.cfg
+++ b/LaunchServer/resources/launchserver/defaults/profile1.10.2.cfg
@@ -27,7 +27,6 @@
 jvmArgs: [
 	"-Dfml.ignorePatchDiscrepancies=true",
 	"-Dfml.ignoreInvalidMinecraftCertificates=true",
-	"-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
 
 	# JVM Attach protection
 	"-XX:+DisableAttachMechanism"
diff --git a/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg b/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg
index f736c16..65aec49 100755
--- a/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg
+++ b/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg
@@ -31,7 +31,6 @@
 jvmArgs: [
 	"-Dfml.ignorePatchDiscrepancies=true",
 	"-Dfml.ignoreInvalidMinecraftCertificates=true",
-	"-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
 
 	# JVM Attach protection
 	"-XX:+DisableAttachMechanism",
diff --git a/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg b/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg
index b89347c..eaf0a6d 100755
--- a/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg
+++ b/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg
@@ -31,7 +31,6 @@
 jvmArgs: [
 	"-Dfml.ignorePatchDiscrepancies=true",
 	"-Dfml.ignoreInvalidMinecraftCertificates=true",
-	"-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
 
 	# Experimental
 	"-XX:+DisableAttachMechanism"
diff --git a/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg b/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg
index 6c7d359..e1789ac 100755
--- a/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg
+++ b/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg
@@ -31,7 +31,6 @@
 jvmArgs: [
 	"-Dfml.ignorePatchDiscrepancies=true",
 	"-Dfml.ignoreInvalidMinecraftCertificates=true",
-	"-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
 
 	# JVM Attach protection
 	"-XX:+DisableAttachMechanism"
diff --git a/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg b/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg
index 7d8c09f..8d551c9 100755
--- a/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg
+++ b/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg
@@ -27,7 +27,6 @@
 jvmArgs: [
 	"-Dfml.ignorePatchDiscrepancies=true",
 	"-Dfml.ignoreInvalidMinecraftCertificates=true",
-	"-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
 
 	# JVM Attach protection
 	"-XX:+DisableAttachMechanism"
diff --git a/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg b/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg
index c93683d..18bae5e 100755
--- a/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg
+++ b/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg
@@ -27,7 +27,6 @@
 jvmArgs: [
 	"-Dfml.ignorePatchDiscrepancies=true",
 	"-Dfml.ignoreInvalidMinecraftCertificates=true",
-	"-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true",
 
 	# JVM Attach protection
 	"-XX:+DisableAttachMechanism"
diff --git a/Launcher/source/client/ClientLauncher.java b/Launcher/source/client/ClientLauncher.java
index 2bd9f28..ac13d68 100755
--- a/Launcher/source/client/ClientLauncher.java
+++ b/Launcher/source/client/ClientLauncher.java
@@ -44,6 +44,7 @@
 import launcher.serialize.stream.StreamObject;
 
 public final class ClientLauncher {
+	private static final String MAGICAL_INTEL_OPTION = "-XX:HeapDumpPath=ThisTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump";
 	private static final Set<PosixFilePermission> BIN_POSIX_PERMISSIONS = Collections.unmodifiableSet(EnumSet.of(
 		PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE, PosixFilePermission.OWNER_EXECUTE, // Owner
 		PosixFilePermission.GROUP_READ, PosixFilePermission.GROUP_EXECUTE, // Group
@@ -103,10 +104,16 @@
 		// Fill CLI arguments
 		List<String> args = new LinkedList<>();
 		args.add(javaBin.toString());
+		args.add(MAGICAL_INTEL_OPTION);
 		if (params.ram > 0 && params.ram <= JVMHelper.RAM) {
 			args.add("-Xmx" + params.ram + 'M');
 		}
 		args.add(jvmProperty(LogHelper.DEBUG_PROPERTY, Boolean.toString(LogHelper.isDebugEnabled())));
+		if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE && JVMHelper.OS_VERSION.startsWith("10.")) {
+		    LogHelper.debug("MustDie 10 fix is applied");
+		    args.add(jvmProperty("os.name", "Windows 10"));
+		    args.add(jvmProperty("os.version", "10.0"));
+		}
 
 		// Add classpath and main class
 		Collections.addAll(args, profile.object.getJvmArgs());
diff --git a/Launcher/source/helper/JVMHelper.java b/Launcher/source/helper/JVMHelper.java
old mode 100644
new mode 100755
index ea94e50..f304c88
--- a/Launcher/source/helper/JVMHelper.java
+++ b/Launcher/source/helper/JVMHelper.java
@@ -16,6 +16,7 @@
 public final class JVMHelper {
 	// System properties
 	@LauncherAPI public static final OS OS_TYPE = OS.byName(System.getProperty("os.name"));
+	@LauncherAPI public static final String OS_VERSION = System.getProperty("os.version");
 	@LauncherAPI public static final int OS_BITS = getCorrectOSArch();
 	@LauncherAPI public static final int JVM_BITS = Integer.parseInt(System.getProperty("sun.arch.data.model"));
 	@LauncherAPI public static final int RAM = getRAMAmount();