Updates from pmcmanus review.