Some more changes after review.