Addressing some comments