Corrections based on Naomi's comments