diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
index 428c248b47d..3d2417324fc 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/TomcatClassPath.java
@@ -153,7 +153,7 @@ public Method run() {
                 try {
                     final Object cp = getURLClassPath((URLClassLoader) getClassLoader());
                     final Class<?> clazz = cp.getClass();
-                    return clazz.getDeclaredMethod("addURL", URL.class);
+                    return clazz.getDeclaredMethod("getURLs");
                 } catch (final Exception e) {
                     throw new LoaderRuntimeException(e);
                 }
@@ -168,7 +168,7 @@ protected void rebuild() {
             final Object cp = getURLClassPath((URLClassLoader) getClassLoader());
             final Method getURLsMethod = getGetURLsMethod();
             //noinspection NullArgumentToVariableArgMethod
-            final URL[] urls = (URL[]) getURLsMethod.invoke(cp, (Object) null);
+            final URL[] urls = (URL[]) getURLsMethod.invoke(cp);
 
             if (urls.length < 1) {
                 return;
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index cbec4b030d9..2b1b79bccc9 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -1738,12 +1738,12 @@ public void afterStart(final StandardContext standardContext) {
 
         // if appInfo is null this is a failed deployment... just ignore
         final ContextInfo contextInfo = getContextInfo(standardContext);
-        contextInfo.module = null; // shouldnt be there after startup (actually we shouldnt need it from info tree but our scanning does)
         if (contextInfo != null && contextInfo.appInfo == null) {
             return;
         } else if (contextInfo == null) { // openejb webapp loaded from the LoaderServlet
             return;
         }
+        contextInfo.module = null; // shouldnt be there after startup (actually we shouldnt need it from info tree but our scanning does)
 
         final String id = getId(standardContext);
         WebAppInfo currentWebAppInfo = null;
diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml
index 5ac6cf5b729..934225a4b82 100644
--- a/tomee/tomee-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-webapp/src/main/assembly/war.xml
@@ -40,6 +40,10 @@
       <directory>${project.basedir}/src/main/webapp</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/webjars-resources/META-INF/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
     <fileSet>
       <directory>${project.basedir}/target/classes</directory>
       <outputDirectory>/</outputDirectory>