Minor fixes after review.