latest feedback 8 fixes