Update per PR comments