Updates from review comments.