diff --git a/libs/freetdm/mod_openzap/mod_openzap.2008.vcproj b/libs/freetdm/mod_openzap/mod_openzap.2008.vcproj
index fca3f9b9d7..720849dee9 100644
--- a/libs/freetdm/mod_openzap/mod_openzap.2008.vcproj
+++ b/libs/freetdm/mod_openzap/mod_openzap.2008.vcproj
@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FreeSwitchCore.lib"
-				OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
+				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_openzap.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FreeSwitchCore.lib"
-				OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
+				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_openzap.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
 				GenerateDebugInformation="true"
diff --git a/libs/freetdm/msvc/openzap.2008.vcproj b/libs/freetdm/msvc/openzap.2008.vcproj
index 70e20bd2f4..8e61f61eef 100644
--- a/libs/freetdm/msvc/openzap.2008.vcproj
+++ b/libs/freetdm/msvc/openzap.2008.vcproj
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c b/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
index 4fa255465b..c45e5f295b 100644
--- a/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
+++ b/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
@@ -1016,9 +1016,7 @@ static ZIO_IO_LOAD_FUNCTION(wanpipe_init)
 	wanpipe_interface.wait = wanpipe_wait;
 	wanpipe_interface.read = wanpipe_read;
 	wanpipe_interface.write = wanpipe_write;
-#ifndef WIN32
 	wanpipe_interface.poll_event = wanpipe_poll_event;
-#endif
 	wanpipe_interface.next_event = wanpipe_next_event;
 	wanpipe_interface.channel_destroy = wanpipe_channel_destroy;
 	wanpipe_interface.get_alarms = wanpipe_get_alarms;