fixes from the PR review