Minor updates before review.