Some fixes to ImageLoader using crossfade incorrectly