A couple more changes to the ELF code