Updates from PR review