fixes to system replicator