Bandaid memory leak, Fix IIcon crash, Fix TE mapping