Fixed PR comments