Some PR Fixes