Fix replication delta unit + misc. changes following review