Fixes to enable continuous replication to remote server