Fix elf loading 'current' management