Fix review comments.