replicator fixes