Add image production and other fixes