feedback 8 fixes