COOPR-568: changes for distributed mode

These are not variables. Please, fix.