Feedback 8 Fixes