Small fixes on multiple images