More peer manager stuff