Fixed Uploader utility to handle existing files much better