ImageLoading performance fixes