Fixed Upload issues; Upload Completion event