More image saving fixes