Minor updates after review.