Two additional fixes from PR comments