Fixes for the image uploader