Address some more comments