Fixups for ender