remote replication fixes