Changes per PR review