Try addressing comments from PR.