fixes to make async image loads better