diff --git a/console/craco.config.js b/console/craco.config.js
index a854a67d34..5744decac2 100644
--- a/console/craco.config.js
+++ b/console/craco.config.js
@@ -37,7 +37,7 @@ module.exports = {
           },
         }),
         new MonacoWebpackPlugin({
-          languages: ['xml', 'json', 'html', 'plaintext'],
+          languages: ['xml', 'json', 'plaintext'],
           globalAPI: true,
         }),
       ],
diff --git a/deploy/hawtio-default/pom.xml b/deploy/hawtio-default/pom.xml
index 98b0d6e790..c643a668d0 100644
--- a/deploy/hawtio-default/pom.xml
+++ b/deploy/hawtio-default/pom.xml
@@ -31,6 +31,12 @@
       -->
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>io.hawt</groupId>
+      <artifactId>hawtio-system</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
 
     <!-- let's mark dependencies from the WAR as provided to avoid jetty:run adding duplicates -->
     <dependency>
@@ -41,14 +47,16 @@
     </dependency>
 
     <!-- now let's add some components -->
+    <!-- Connect plugin -->
     <dependency>
       <groupId>io.hawt</groupId>
-      <artifactId>hawtio-log</artifactId>
+      <artifactId>hawtio-local-jvm-mbean</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- Log plugin -->
     <dependency>
       <groupId>io.hawt</groupId>
-      <artifactId>hawtio-local-jvm-mbean</artifactId>
+      <artifactId>hawtio-log</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/deploy/hawtio-default/src/main/java/io/hawt/HawtioDefaultContextListener.java b/deploy/hawtio-default/src/main/java/io/hawt/HawtioDefaultContextListener.java
new file mode 100644
index 0000000000..bafef69c14
--- /dev/null
+++ b/deploy/hawtio-default/src/main/java/io/hawt/HawtioDefaultContextListener.java
@@ -0,0 +1,33 @@
+package io.hawt;
+
+import javax.servlet.ServletContextEvent;
+
+import io.hawt.HawtioContextListener;
+import io.hawt.jvm.local.JVMList;
+
+public class HawtioDefaultContextListener extends HawtioContextListener {
+    private final JVMList jvmList;
+
+    public HawtioDefaultContextListener() {
+        super();
+        this.jvmList = new JVMList();
+    }
+
+    public void contextInitialized(ServletContextEvent servletContextEvent) {
+        super.contextInitialized(servletContextEvent);
+        try {
+            jvmList.init();
+        } catch (Exception e) {
+            throw createServletException(e);
+        }
+    }
+
+    public void contextDestroyed(ServletContextEvent servletContextEvent) {
+        super.contextDestroyed(servletContextEvent);
+        try {
+            jvmList.destroy();
+        } catch (Exception e) {
+            throw createServletException(e);
+        }
+    }
+}
diff --git a/deploy/hawtio-default/src/main/webapp/WEB-INF/web.xml b/deploy/hawtio-default/src/main/webapp/WEB-INF/web.xml
index 90ac33f392..46ef23ab2f 100644
--- a/deploy/hawtio-default/src/main/webapp/WEB-INF/web.xml
+++ b/deploy/hawtio-default/src/main/webapp/WEB-INF/web.xml
@@ -293,7 +293,7 @@
   </mime-mapping>
 
   <listener>
-    <listener-class>io.hawt.HawtioContextListener</listener-class>
+    <listener-class>io.hawt.HawtioDefaultContextListener</listener-class>
   </listener>
 
   <error-page>