minor replication fixes