Make things work in e3 and e4