diff --git a/toolchains/xslt-M4/init.sh b/toolchains/xslt-M4/init.sh
index 46fc1cfb3..5f54f2b07 100644
--- a/toolchains/xslt-M4/init.sh
+++ b/toolchains/xslt-M4/init.sh
@@ -18,6 +18,7 @@ generate_xml_schema() {
     return $cmd_exitcode
   else
     echo -e "${result}"
+    echo "Using transform: ${transform}"
   fi
   return 0;
 }
@@ -35,6 +36,7 @@ generate_json_schema() {
     return $cmd_exitcode
   else
     echo -e "${result}"
+    echo "Using transform: ${transform}"
   fi
   return 0;
 }
diff --git a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
index 0e6148e02..a6f49ff02 100644
--- a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+++ b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
@@ -51,7 +51,7 @@
             <!--<xsl:apply-templates select="schema-version"/>-->
             <string key="type">object</string>
             <map key="definitions">
-                <xsl:apply-templates select="*"/>
+                <xsl:apply-templates select="define-assembly | define-field"/>
             </map>           
             <xsl:apply-templates select="." mode="require-a-root"/>
         </map>