feedback 14 fixes