Almost final E 7 and 8 bugs