Fix r29545 w.r.t sockets and friends (nw)