Socket improvements