fixes from PR review