Feedback-based fixes