CR fixes for image-upload.