Apply fixes to fileupload plugin