Fix ups from feedback.