Fixes in socket classes