feedback 7 fixes