diff --git a/include/zmq.h b/include/zmq.h
index fc525843..47d8359e 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -40,7 +40,7 @@ extern "C" {
 #endif
 
 /******************************************************************************/
-/*  0MQ versioning supprt.                                                    */
+/*  0MQ versioning support.                                                    */
 /******************************************************************************/
 
 ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp
index e4a7491c..9f2e759c 100644
--- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
@@ -78,7 +78,7 @@ namespace zmq
         inline T *xchg (T *val_)
         {
 #if defined ZMQ_ATOMIC_PTR_WINDOWS
-            return (T*) InterlockedExchangePointer (&ptr, val_);
+            return (T*) InterlockedExchangePointer ((PVOID*) &ptr, val_);
 #elif defined ZMQ_ATOMIC_PTR_SYSTEM
             return (T*) atomic_swap_ptr (&ptr, val_);
 #elif defined ZMQ_ATOMIC_PTR_X86