Update from PR comments