Fixes from PR comments