Address more review comments.