Another round of fixes based on the comments.