Address some review comments.