* Replication fixes