Feedback fixes