diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 39c880015636..1764374c1213 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -73,7 +73,9 @@ class GetAddrInfoReqWrap : public ReqWrap<uv_getaddrinfo_t> {
 
 GetAddrInfoReqWrap::GetAddrInfoReqWrap(Environment* env,
                                        Local<Object> req_wrap_obj)
-    : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_GETADDRINFOREQWRAP) {
+    : ReqWrap<uv_getaddrinfo_t>(env,
+                                req_wrap_obj,
+                                AsyncWrap::PROVIDER_GETADDRINFOREQWRAP) {
   Wrap(req_wrap_obj, this);
 }
 
@@ -90,7 +92,9 @@ class GetNameInfoReqWrap : public ReqWrap<uv_getnameinfo_t> {
 
 GetNameInfoReqWrap::GetNameInfoReqWrap(Environment* env,
                                        Local<Object> req_wrap_obj)
-    : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_GETNAMEINFOREQWRAP) {
+    : ReqWrap<uv_getnameinfo_t>(env,
+                                req_wrap_obj,
+                                AsyncWrap::PROVIDER_GETNAMEINFOREQWRAP) {
   Wrap(req_wrap_obj, this);
 }
 
diff --git a/src/node_file.cc b/src/node_file.cc
index 8a00b5d9eb53..e04c4c2ddde3 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -75,7 +75,7 @@ class FSReqWrap: public ReqWrap<uv_fs_t> {
             Local<Object> req,
             const char* syscall,
             char* data = NULL)
-    : ReqWrap(env, req, AsyncWrap::PROVIDER_FSREQWRAP),
+    : ReqWrap<uv_fs_t>(env, req, AsyncWrap::PROVIDER_FSREQWRAP),
       syscall_(syscall),
       data_(data),
       dest_len_(0) {
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc
index 69cdfcdff3cf..2d4919975793 100644
--- a/src/pipe_wrap.cc
+++ b/src/pipe_wrap.cc
@@ -61,7 +61,7 @@ class PipeConnectWrap : public ReqWrap<uv_connect_t> {
 
 
 PipeConnectWrap::PipeConnectWrap(Environment* env, Local<Object> req_wrap_obj)
-    : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_PIPEWRAP) {
+    : ReqWrap<uv_connect_t>(env, req_wrap_obj, AsyncWrap::PROVIDER_PIPEWRAP) {
   Wrap(req_wrap_obj, this);
 }
 
diff --git a/src/queue.h b/src/queue.h
index 075d37fd0a11..9394915a9a90 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -19,23 +19,23 @@
 typedef void *QUEUE[2];
 
 /* Private macros. */
-#define QUEUE_NEXT(q)       (*(QUEUE **) &((*(q))[0]))
-#define QUEUE_PREV(q)       (*(QUEUE **) &((*(q))[1]))
-#define QUEUE_PREV_NEXT(q)  (QUEUE_NEXT(QUEUE_PREV(q)))
-#define QUEUE_NEXT_PREV(q)  (QUEUE_PREV(QUEUE_NEXT(q)))
+#define QUEUE_NEXT(q)       ((*(q))[0])
+#define QUEUE_PREV(q)       ((*(q))[1])
+#define QUEUE_PREV_NEXT(q)  (QUEUE_NEXT((QUEUE *)QUEUE_PREV(q)))
+#define QUEUE_NEXT_PREV(q)  (QUEUE_PREV((QUEUE *)QUEUE_NEXT(q)))
 
 /* Public macros. */
 #define QUEUE_DATA(ptr, type, field)                                          \
   ((type *) ((char *) (ptr) - ((char *) &((type *) 0)->field)))
 
 #define QUEUE_FOREACH(q, h)                                                   \
-  for ((q) = QUEUE_NEXT(h); (q) != (h); (q) = QUEUE_NEXT(q))
+  for ((q) = (QUEUE *) QUEUE_NEXT(h); (q) != (h); (q) = (QUEUE *) QUEUE_NEXT(q))
 
 #define QUEUE_EMPTY(q)                                                        \
-  ((const QUEUE *) (q) == (const QUEUE *) QUEUE_NEXT(q))
+  ((q) == QUEUE_NEXT(q))
 
 #define QUEUE_HEAD(q)                                                         \
-  (QUEUE_NEXT(q))
+  ((QUEUE*)QUEUE_NEXT(q))
 
 #define QUEUE_INIT(q)                                                         \
   do {                                                                        \
diff --git a/src/stream_wrap.h b/src/stream_wrap.h
index 38e5d4842257..d993663b19cc 100644
--- a/src/stream_wrap.h
+++ b/src/stream_wrap.h
@@ -36,7 +36,9 @@ class StreamWrap;
 class ShutdownWrap : public ReqWrap<uv_shutdown_t> {
  public:
   ShutdownWrap(Environment* env, v8::Local<v8::Object> req_wrap_obj)
-      : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_SHUTDOWNWRAP) {
+      : ReqWrap<uv_shutdown_t>(env,
+                               req_wrap_obj,
+                               AsyncWrap::PROVIDER_SHUTDOWNWRAP) {
     Wrap(req_wrap_obj, this);
   }
 
@@ -50,7 +52,7 @@ class WriteWrap: public ReqWrap<uv_write_t> {
   // TODO(trevnorris): WrapWrap inherits from ReqWrap, which I've globbed
   // into the same provider. How should these be broken apart?
   WriteWrap(Environment* env, v8::Local<v8::Object> obj, StreamWrap* wrap)
-      : ReqWrap(env, obj, AsyncWrap::PROVIDER_WRITEWRAP),
+      : ReqWrap<uv_write_t>(env, obj, AsyncWrap::PROVIDER_WRITEWRAP),
         wrap_(wrap) {
     Wrap(obj, this);
   }
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index a5b20a6ac5a6..6b2408c98908 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -61,7 +61,7 @@ class TCPConnectWrap : public ReqWrap<uv_connect_t> {
 
 
 TCPConnectWrap::TCPConnectWrap(Environment* env, Local<Object> req_wrap_obj)
-    : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPWRAP) {
+    : ReqWrap<uv_connect_t>(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPWRAP) {
   Wrap(req_wrap_obj, this);
 }
 
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
index 614326fa1fb9..923875e617c9 100644
--- a/src/udp_wrap.cc
+++ b/src/udp_wrap.cc
@@ -64,7 +64,7 @@ class SendWrap : public ReqWrap<uv_udp_send_t> {
 SendWrap::SendWrap(Environment* env,
                    Local<Object> req_wrap_obj,
                    bool have_callback)
-    : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_UDPWRAP),
+    : ReqWrap<uv_udp_send_t>(env, req_wrap_obj, AsyncWrap::PROVIDER_UDPWRAP),
       have_callback_(have_callback) {
   Wrap(req_wrap_obj, this);
 }