feedback 12 fixes