More socket changes