More Socket manager changes