Hotfix

Fixed a couple of replication issues.