Fixes to remote image fetching