latest feedback 9 fixes