diff --git a/libsofia-sip-ua/nta/test_nta.c b/libsofia-sip-ua/nta/test_nta.c
index 72eaf0252166d6074c6a34bb6d3034e76a75464e..b6cf9bd2717fcf9b42f354f657b28fdaca56124a 100644
--- a/libsofia-sip-ua/nta/test_nta.c
+++ b/libsofia-sip-ua/nta/test_nta.c
@@ -67,6 +67,7 @@ typedef struct agent_t agent_t;
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
+#include <unistd.h>
 
 extern su_log_t nta_log[];
 extern su_log_t tport_log[];
diff --git a/libsofia-sip-ua/su/su_alloc_test.c b/libsofia-sip-ua/su/su_alloc_test.c
index bc3852b7ce00bda72ea916259c81ab53cde3d6a6..d3fda65af6d9cfa7a608bc322b434a7776593a40 100644
--- a/libsofia-sip-ua/su/su_alloc_test.c
+++ b/libsofia-sip-ua/su/su_alloc_test.c
@@ -549,7 +549,7 @@ static int test_auto(void)
 
   for (i = 1; i < 8192; i++) {
     TEST_1(b = su_realloc(tmphome, b, i));
-    b[i - 1] = 0xaa;
+    b[i - 1] = (char)0xaa;
  
     if ((i % 32) == 0)
       TEST_1(b = su_realloc(tmphome, b, 1));
diff --git a/libsofia-sip-ua/su/su_root_test.c b/libsofia-sip-ua/su/su_root_test.c
index 60b9c312c95a0faca6ac6a948a0bdfeeaf81e267..f585547e48972ba5fa73b08cae9819f8aaac0711 100644
--- a/libsofia-sip-ua/su/su_root_test.c
+++ b/libsofia-sip-ua/su/su_root_test.c
@@ -136,8 +136,17 @@ int wakeup(root_test_t *rt,
 	   test_ep_t *ep)
 {
   char buffer[64];
+  int n, error;
+ 
+  su_wait_events(w, ep->s);
 
-  TEST_1(recv(ep->s, buffer, sizeof(buffer), 0) > 0);
+  n = recv(ep->s, buffer, sizeof(buffer), 0);
+  error = su_errno();
+ 
+  if (n < 0)
+    fprintf(stderr, "%s: %s\n", "recv", su_strerror(error));
+
+  TEST_1(n > 0);
 
   rt->rt_received = ep->i;
 	   
@@ -238,10 +247,12 @@ static int register_test(root_test_t *rt)
   }
 
   for (i = 0; i < 5; i++) {
-    rt->rt_ep[i]->registered = 
-      su_root_register(rt->rt_root, rt->rt_ep[i]->wait, 
-		       wakeups[i], rt->rt_ep[i], 1);
-    TEST_1(rt->rt_ep[i]->registered > 0);
+    test_ep_t *ep = rt->rt_ep[i];
+    TEST_1(su_wait_create(ep->wait, ep->s, SU_WAIT_IN|SU_WAIT_ERR) != -1);
+    ep->registered = 
+      su_root_register(rt->rt_root, ep->wait, 
+		       wakeups[i], ep, 1);
+    TEST_1(ep->registered > 0);
   }
 
   for (i = 0; i < 5; i++) {