Socket drawing fixes