Fix replication resource and remote dehydrate