Fix image specs and add full image export back