Final PR comments