Adding a few more PR tweaks