Fixes in image loader