PR issues fixed