diff --git a/pom.xml b/pom.xml
index b49632ac..48d4a6bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,11 +14,17 @@
 		<!-- default properties (JDK 1.7 or earlier) -->
 		<jvm.args.perm.size>-XX:MaxPermSize=128m</jvm.args.perm.size>
 		<jvm.args.gc.log.path>-Xloggc:logs/gc.log</jvm.args.gc.log.path>
+		<jvm.args.print.heap.at.gc>-XX:+PrintHeapAtGC</jvm.args.print.heap.at.gc>
+		<jvm.args.print.gc.details>-XX:+PrintGCDetails</jvm.args.print.gc.details>
+		<jvm.args.print.gc.date.stamps>-XX:+PrintGCDateStamps</jvm.args.print.gc.date.stamps>
+		<jvm.args.gc.log.file.rotation>-XX:+UseGCLogFileRotation</jvm.args.gc.log.file.rotation>
+		<jvm.args.number.of.gc.log.files>-XX:NumberOfGCLogFiles=5</jvm.args.number.of.gc.log.files>
+		<jvm.args.gc.log.file.size>-XX:GCLogFileSize=10M</jvm.args.gc.log.file.size>
 	</properties>
 
 	<profiles>
 		<profile>
-			<id>JDK-Switch</id>
+			<id>JDK8-Switch</id>
 			<activation>
 				<jdk>1.8</jdk>
 			</activation>
@@ -27,6 +33,23 @@
 				<jvm.args.gc.log.path>-Xloggc:logs/gc_%p_%t.log</jvm.args.gc.log.path>
 			</properties>
 		</profile>
+		<profile>
+			<id>JDK11-Switch</id>
+			<activation>
+				<jdk>11</jdk>
+			</activation>
+			<properties>
+				<jvm.args.perm.size>-XX:MaxMetaspaceSize=128m</jvm.args.perm.size>
+				<jvm.args.gc.log.path>-Xlog:gc*:logs/gc_%p_%t.log:time,level,tags:filecount=5,filesize=10M</jvm.args.gc.log.path>
+				<!-- TODO Remove these properties -->
+				<jvm.args.print.heap.at.gc>-Dummy=Dummy</jvm.args.print.heap.at.gc>
+				<jvm.args.print.gc.details>-Dummy=Dummy</jvm.args.print.gc.details>
+				<jvm.args.print.gc.date.stamps>-Dummy=Dummy</jvm.args.print.gc.date.stamps>
+				<jvm.args.gc.log.file.rotation>-Dummy=Dummy</jvm.args.gc.log.file.rotation>
+				<jvm.args.number.of.gc.log.files>-Dummy=Dummy</jvm.args.number.of.gc.log.files>
+				<jvm.args.gc.log.file.size>-Dummy=Dummy</jvm.args.gc.log.file.size>
+			</properties>
+		</profile>
 	</profiles>
 	
 	<dependencies>
@@ -212,12 +235,12 @@
 								<argument>-Xmx256m</argument>
 								<argument>-XX:MaxDirectMemorySize=90m</argument>
 								<argument>-XX:+UseSerialGC</argument>
-								<argument>-XX:+PrintHeapAtGC</argument>
-								<argument>-XX:+PrintGCDetails</argument>
-								<argument>-XX:+PrintGCDateStamps</argument>
-								<argument>-XX:+UseGCLogFileRotation</argument>
-								<argument>-XX:NumberOfGCLogFiles=5</argument>
-								<argument>-XX:GCLogFileSize=10M</argument>
+								<argument>${jvm.args.print.heap.at.gc}</argument>
+								<argument>${jvm.args.print.gc.details}</argument>
+								<argument>${jvm.args.print.gc.date.stamps}</argument>
+								<argument>${jvm.args.gc.log.file.rotation}</argument>
+								<argument>${jvm.args.number.of.gc.log.files}</argument>
+								<argument>${jvm.args.gc.log.file.size}</argument>
 								<argument>-XX:GCTimeLimit=15</argument>
 								<argument>-XX:GCHeapFreeLimit=50</argument>
 								<argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
diff --git a/src/main/java/org/t246osslab/easybuggy/errors/GenericSignatureFormatErrorServlet.java b/src/main/java/org/t246osslab/easybuggy/errors/GenericSignatureFormatErrorServlet.java
deleted file mode 100644
index 9fbd569e..00000000
--- a/src/main/java/org/t246osslab/easybuggy/errors/GenericSignatureFormatErrorServlet.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.t246osslab.easybuggy.errors;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.t246osslab.easybuggy.core.servlets.AbstractServlet;
-
-@SuppressWarnings("serial")
-@WebServlet(urlPatterns = { "/gsfe" })
-public class GenericSignatureFormatErrorServlet extends AbstractServlet {
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-        final TestClass<String> testClass1 = new TestClass<String>();
-        TestClass<?> testClass2 = testClass1;
-        testClass2.new TestInnerClass() {
-        }.getClass().getGenericSuperclass();
-    }
-
-    class TestClass<T> {
-        public class TestInnerClass {
-        }
-    }
-}
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 9f49e981..cc8fbb96 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -275,12 +275,6 @@
                     <fmt:param value="FactoryConfigurationError" />
                 </fmt:message>
             </p></li>
-        <li><p>
-                <a href="gsfe" target="_blank">GenericSignatureFormatError</a>:
-                <fmt:message key="function.description.throwable">
-                    <fmt:param value="GenericSignatureFormatError" />
-                </fmt:message>
-            </p></li>
         <li><p>
                 <a href="ncdfe" target="_blank">NoClassDefFoundError</a>:
                 <fmt:message key="function.description.throwable">