FileUpload fixes