Address some comments