level 2 fixes