diff --git a/libs/win32/udns/libudns.vcproj b/libs/win32/udns/libudns.vcproj
index aa44b92272..a4209098be 100644
--- a/libs/win32/udns/libudns.vcproj
+++ b/libs/win32/udns/libudns.vcproj
@@ -20,7 +20,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/src/mod/applications/mod_enum/mod_enum.c b/src/mod/applications/mod_enum/mod_enum.c
index 078b963f93..9bf46a50a2 100644
--- a/src/mod/applications/mod_enum/mod_enum.c
+++ b/src/mod/applications/mod_enum/mod_enum.c
@@ -258,10 +258,10 @@ static void free_results(enum_record_t **results)
 
 	for(rp = *results; rp;) {
 		fp = rp;
+		rp = rp->next;
 		switch_safe_free(fp->service);
 		switch_safe_free(fp->route);
 		switch_safe_free(fp);
-		rp = rp->next;
 	}
 	*results = NULL;
 }
diff --git a/src/mod/applications/mod_enum/mod_enum.vcproj b/src/mod/applications/mod_enum/mod_enum.vcproj
index d4bd348377..f2f20c08ab 100644
--- a/src/mod/applications/mod_enum/mod_enum.vcproj
+++ b/src/mod/applications/mod_enum/mod_enum.vcproj
@@ -21,7 +21,7 @@
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -104,7 +104,7 @@
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"