fixes from PR comments