Minor modifications for socket compilation