diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
index b53f17723..ae5f83050 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java
@@ -122,7 +122,8 @@ public class NBCLIScenarioParser {
             if (nameparts.length==1) {
                 Map<String, String> namedScenario = scenarios.getNamedScenario(scenarioName);
                 if (namedScenario==null) {
-                    throw new BasicError("Named step '" + scenarioName + "' was not found.");
+                    throw new BasicError("Unable to find named scenario '" + scenarioName + "' in workload '" + workloadName
+                    + "', but you can pick from one of: " + String.join(", ", scenarios.getScenarioNames()));
                 }
                 namedSteps.putAll(namedScenario);
             } else {
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 98e8559dc..136cd7921 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -465,6 +465,14 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>log4j2.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <testResources>
             <testResource>
                 <directory>src/test/resources</directory>
@@ -473,7 +481,7 @@
                 </excludes>
                 <filtering>true</filtering>
             </testResource>
-            <testResource>
+            <testResource> <!-- Not sure why the complementary configs are here.. -->
                 <directory>src/test/resources</directory>
                 <includes>
                     <include>log4j2-test.xml</include>
diff --git a/nbr/pom.xml b/nbr/pom.xml
index 7eafb9e28..85a156a1b 100644
--- a/nbr/pom.xml
+++ b/nbr/pom.xml
@@ -82,9 +82,19 @@
                 <includes>
                     <include>version.properties</include>
                     <include>nb_version_info.md</include>
+                    <include>log4j2.xml</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>examples/**</include>
+                    <include>scripts/**</include>
+                    <include>**/*.md</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
         </resources>
 
         <plugins>