replication retry and agent warning improvement