7 12 fixes