EX2 fixes