Fixes for firefox/slow-loading of images