Fix PR comments on #63