Fixed more PR issues