14 out of 16 fixes