More fixes to require z80e