Fixes for socket tracking and peer mode for #640 and #633