diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 51877d84a1..1bc5aad546 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -68,6 +68,10 @@ BEGIN_EXTERN_C
#define SWITCH_SCRIPT_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "scripts"
#endif
+#ifndef SWITCH_HTDOCS_DIR
+#define SWITCH_HTDOCS_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "htdocs"
+#endif
+
struct switch_directories {
char *base_dir;
char *mod_dir;
diff --git a/src/switch_xml.c b/src/switch_xml.c
index 65a0d3a3b5..e50668a9d2 100644
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -932,7 +932,7 @@ static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst,
// Recursively converts each tag to xml appending it to *s. Reallocates *s if
// its length excedes max. start is the location of the previous tag in the
// parent tag's character content. Returns *s.
-SWITCH_DECLARE(static char *) switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max,
+static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max,
switch_size_t start, char ***attr)
{
int i, j;
@@ -984,7 +984,7 @@ SWITCH_DECLARE(static char *) switch_xml_toxml_r(switch_xml_t xml, char **s, swi
// converts an switch_xml structure back to xml, returning it as a string that must
// be freed
-char *switch_xml_toxml(switch_xml_t xml)
+SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml)
{
switch_xml_t p = (xml) ? xml->parent : NULL, o = (xml) ? xml->ordered : NULL;
switch_xml_root_t root = (switch_xml_root_t)xml;
diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index caa6a0152a..72b9991205 100644
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -105,7 +105,7 @@
/>