More fixes in for replicaset behavior