Fixes to enable continuous replication on remote server