Small fixes following review.