Minor updates from feedback.