Updated 7 fixes