Address reviewer comments.