fixing PR issues