PR comments corrections