Corrections based on comments.