Address some more comments.