Fixes for Juliet's review.