Fixed PR issues