Corrections in response to PR comments