Small fixes from PR comments