Fix some errors in how connection info for PB was being extracted.