Last few fixes from Juliet's review.