Fix inconsistencies with adding images from MM

Fixes #128.