- Fix PR comments