Replication behavior fixes 2.5

I found the issues during documentation work. This is for the 2.5 branch