Updates per review comments.