Fixes for e2e replication / remote connector tests