Fixes to enable continuous replication from remote server