Fix some large image loading.
Merge branch 'fix-image-loading'