Minor tweaks to allow stock image creation