More changes on ELF read support