UploadForm code fixes after test