diff --git a/server/Windows/wf_update.c b/server/Windows/wf_update.c
index 081b9478b..bb0535723 100644
--- a/server/Windows/wf_update.c
+++ b/server/Windows/wf_update.c
@@ -203,7 +203,7 @@ void wf_update_encoder_reset(wfInfo* wfi)
 			wfi->rfx_context->width = wfi->servscreen_width;
 			wfi->rfx_context->height = wfi->servscreen_height;
 			rfx_context_set_pixel_format(wfi->rfx_context, RDP_PIXEL_FORMAT_B8G8R8A8);
-			rfx_context_set_cpu_opt(wfi->rfx_context, CPU_SSE2);
+			//rfx_context_set_cpu_opt(wfi->rfx_context, CPU_SSE2);
 			wfi->s = stream_new(0xFFFF);
 		}
 
diff --git a/winpr/include/winpr/pool.h b/winpr/include/winpr/pool.h
index 2c707ad09..48b16ee2d 100644
--- a/winpr/include/winpr/pool.h
+++ b/winpr/include/winpr/pool.h
@@ -81,6 +81,7 @@ typedef struct _TP_CALLBACK_ENVIRON_V1
 
 /* Non-Windows and pre Windows 7 */
 #if ((!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0601)))
+//#if !defined(_WIN32_WINNT_VISTA)
 
 typedef struct _TP_CALLBACK_ENVIRON_V3
 {
@@ -132,7 +133,8 @@ typedef VOID (*PTP_WAIT_CALLBACK)(PTP_CALLBACK_INSTANCE Instance, PVOID Context,
 
 
 /* Non-Windows and pre Vista */
-#if ((!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0600)))
+//#if ((!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0600)))
+#if !defined(_WIN32_WINNT_VISTA)
 
 typedef VOID (*PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE Instance, PVOID Context, PVOID Overlapped,
 	ULONG IoResult, ULONG_PTR NumberOfBytesTransferred, PTP_IO Io);