Corrections after PR review.