Review fixes from PR #195