Fixed review comments.