Fix up socket handler to hit new socket api