Adapt to security-manager API changes