PR Feedback fixes