Minor fixes after first review.