Fixing PR comments