PR comments fixes