Client fixes for DSE nodes