Fix based on comments in PR.