Add fixes from PR comments