Updates in response to PR comments