Fixed for PR review notes.