Tweaks to production image generator