Fix previous commits per feedback.