Fix EX2 stuff more