Better handling of image upload.