Fixes based on Sue's review feedback.