Updates following initial review.