Various small changes after review.