more fixes in the replica-related communication