feedback 11 fixes