diff --git a/esp/scm/additional.cmake b/esp/scm/additional.cmake
index 105dbaa7b63..e34b4b9c76a 100644
--- a/esp/scm/additional.cmake
+++ b/esp/scm/additional.cmake
@@ -53,6 +53,9 @@ foreach ( loop_var ${ESPSCM_SRCS} )
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}_esp.ipp PROPERTIES GENERATED TRUE)
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}.xml PROPERTIES GENERATED TRUE)
     set ( ESP_GENERATED_INCLUDES ${ESP_GENERATED_INCLUDES} ${ESPSCM_GENERATED_DIR}/${result}.esp ${ESPSCM_GENERATED_DIR}/${result}.hpp ${ESPSCM_GENERATED_DIR}/${result}.ipp ${ESPSCM_GENERATED_DIR}/${result}_esp.ipp ${ESPSCM_GENERATED_DIR}/${result}.xml )
+    if ( PLATFORM )
+        Install( FILES ${ESPSCM_GENERATED_DIR}/${result}.xml DESTINATION componentfiles/esdl_files COMPONENT Runtime )
+    endif ( PLATFORM )
 endforeach ( loop_var ${ESPSCM_SRCS} )
 
 include_directories ( ${ESPSCM_GENERATED_DIR} ${HPCC_SOURCE_DIR}/esp/espcommon)
diff --git a/esp/scm/smcscm.cmake b/esp/scm/smcscm.cmake
index 42ff20ff9d3..d90d80364c3 100644
--- a/esp/scm/smcscm.cmake
+++ b/esp/scm/smcscm.cmake
@@ -70,6 +70,9 @@ foreach ( loop_var ${ESPSCM_SRCS} )
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}_esp.ipp PROPERTIES GENERATED TRUE)
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}.xml PROPERTIES GENERATED TRUE)
     set ( ESP_GENERATED_INCLUDES ${ESP_GENERATED_INCLUDES} ${ESPSCM_GENERATED_DIR}/${result}.esp ${ESPSCM_GENERATED_DIR}/${result}.hpp ${ESPSCM_GENERATED_DIR}/${result}.ipp ${ESPSCM_GENERATED_DIR}/${result}_esp.ipp ${ESPSCM_GENERATED_DIR}/${result}.xml )
+    if ( PLATFORM )
+        Install( FILES ${ESPSCM_GENERATED_DIR}/${result}.xml DESTINATION componentfiles/esdl_files COMPONENT Runtime )
+    endif ( PLATFORM )
 endforeach ( loop_var ${ESPSCM_SRCS} )
 
 include_directories ( ${ESPSCM_GENERATED_DIR} ${HPCC_SOURCE_DIR}/esp/espcommon )
diff --git a/esp/xslt/esp_service_xml2xsd.xslt b/esp/xslt/esp_service_xml2xsd.xslt
index ee3a4d0782a..9568aaf16e5 100644
--- a/esp/xslt/esp_service_xml2xsd.xslt
+++ b/esp/xslt/esp_service_xml2xsd.xslt
@@ -143,12 +143,16 @@
                     <xsl:when test="@xsd_type">
                         <xsl:value-of select="@xsd_type"/>
                     </xsl:when>
+                    <xsl:when test="@xsd_extended_type">xsd:<xsl:value-of select="@xsd_extended_type"/>
+                    </xsl:when>
                     <xsl:when test="@type='bool'">xsd:<xsl:value-of select="'boolean'"/>
                     </xsl:when>
                     <xsl:when test="@type='unsigned'">xsd:<xsl:value-of select="'unsignedInt'"/>
                     </xsl:when>
                     <xsl:when test="@type='binary'">xsd:<xsl:value-of select="'base64Binary'"/>
                     </xsl:when>
+                    <xsl:when test="@type='int64'">xsd:<xsl:value-of select="'long'"/>
+                    </xsl:when>
                     <xsl:when test="@type">xsd:<xsl:value-of select="@type"/>
                     </xsl:when>
                     <xsl:when test="@complex_type">tns:<xsl:value-of select="@complex_type"/>